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:
commit
25eedcdb43
1 changed files with 13 additions and 6 deletions
19
library/yum
19
library/yum
|
@ -311,16 +311,23 @@ def main():
|
||||||
|
|
||||||
|
|
||||||
if 'list' in params:
|
if 'list' in params:
|
||||||
my = yum_base(conf_file=params['conf_file'], cachedir=True)
|
try:
|
||||||
results = dict(results=list_stuff(my, params['list']))
|
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:
|
elif 'state' in params:
|
||||||
if 'pkg' not in params:
|
if 'pkg' not in params:
|
||||||
results['msg'] = "No pkg specified"
|
results['msg'] = "No pkg specified"
|
||||||
else:
|
else:
|
||||||
my = yum_base(conf_file=params['conf_file'], cachedir=True)
|
try:
|
||||||
state = params['state']
|
my = yum_base(conf_file=params['conf_file'], cachedir=True)
|
||||||
pkgspec = params['pkg']
|
state = params['state']
|
||||||
results = ensure(my, state, pkgspec)
|
pkgspec = params['pkg']
|
||||||
|
results = ensure(my, state, pkgspec)
|
||||||
|
except Exception, e:
|
||||||
|
return 1, str(e)
|
||||||
|
|
||||||
print json.dumps(results)
|
print json.dumps(results)
|
||||||
return 0, None
|
return 0, None
|
||||||
|
|
Loading…
Add table
Reference in a new issue