1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #104 from skvidal/master

yum module fix - catch more errors
This commit is contained in:
Michael DeHaan 2012-04-02 09:52:37 -07:00
commit 25eedcdb43

View file

@ -311,16 +311,23 @@ def main():
if 'list' in params:
my = yum_base(conf_file=params['conf_file'], cachedir=True)
results = dict(results=list_stuff(my, params['list']))
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:
my = yum_base(conf_file=params['conf_file'], cachedir=True)
state = params['state']
pkgspec = params['pkg']
results = ensure(my, state, pkgspec)
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