saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reimplement list_upgrades to use XML output from Zypper instead

Browse source
This commit is contained in:
Bo Maryniuk 2016-02-24 11:20:26 +01:00
parent e87864986d
commit ab3ff53d89
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
salt/modules/zypper.py
View file

@ -87,34 +87,21 @@ def list_upgrades(refresh=True):
'''
if refresh:
refresh_db()
ret = {}
call = __salt__['cmd.run_all'](
_zypper('list-updates'), output_loglevel='trace'
)
if call['retcode'] != 0:
comment = ''
if 'stderr' in call:
comment += call['stderr']
if 'stdout' in call:
comment += call['stdout']
raise CommandExecutionError(
'{0}'.format(comment)
)
else:
out = call['stdout']
ret = dict()
run_data = __salt__['cmd.run_all'](_zypper('-x', 'list-updates'), output_loglevel='trace')
if run_data['retcode'] != 0:
msg = list()
for chnl in ['stderr', 'stdout']:
if run_data.get(chnl, '').strip():
msg.append(run_data[chnl].strip())
raise CommandExecutionError(os.linesep.join(msg) or
'Zypper returned non-zero system exit. See Zypper logs for more details.')
doc = dom.parseString(run_data['stdout'])
for update_node in doc.getElementsByTagName('update'):
if update_node.getAttribute('kind') == 'package':
ret[update_node.getAttribute('name')] = update_node.getAttribute('edition')
for line in out.splitlines():
if not line:
continue
if '|' not in line:
continue
try:
status, repo, name, cur, avail, arch = \
[x.strip() for x in line.split('|')]
except (ValueError, IndexError):
continue
if status == 'v':
ret[name] = avail
return ret
# Provide a list_updates function for those used to using zypper list-updates