Commit 25eedcdb by Michael DeHaan

Merge pull request #104 from skvidal/master

yum module fix - catch more errors
parents 5764ccdb 08163c62
......@@ -311,16 +311,23 @@ def main():
if 'list' in params:
try:
my = yum_base(conf_file=params['conf_file'], cachedir=True)
results = dict(results=list_stuff(my, params['list']))
except Exception, e:
return 1, str(e)
elif 'state' in params:
if 'pkg' not in params:
results['msg'] = "No pkg specified"
else:
try:
my = yum_base(conf_file=params['conf_file'], cachedir=True)
state = params['state']
pkgspec = params['pkg']
results = ensure(my, state, pkgspec)
except Exception, e:
return 1, str(e)
print json.dumps(results)
return 0, None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment