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

salt/modules/aptpkg.py: add fromrepo support to list_upgrades

Browse source
This commit is contained in:
Erik Johnson 2016-06-08 16:28:17 -05:00
parent cdda593c50
commit 4f11c16d86
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
salt/modules/aptpkg.py
View file

@ -1044,7 +1044,7 @@ def list_pkgs(versions_as_list=False,
return ret
def _get_upgradable():
def _get_upgradable(**kwargs):
'''
Utility function to get upgradable packages
@ -1052,18 +1052,22 @@ def _get_upgradable():
{ 'pkgname': '1.2.3-45', ... }
'''
cmd = 'apt-get --just-print dist-upgrade'
call = __salt__['cmd.run_all'](cmd, output_loglevel='trace')
cmd = ['apt-get', '--just-print', 'dist-upgrade']
fromrepo = _get_repo(**kwargs)
if fromrepo:
cmd.extend(['-o', 'APT::Default-Release={0}'.format(fromrepo)])
call = __salt__['cmd.run_all'](cmd,
python_shell=False,
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)
)
msg = 'Failed to get upgrades'
for key in ('stderr', 'stdout'):
if call[key]:
msg += ': ' + call[key]
break
raise CommandExecutionError(msg)
else:
out = call['stdout']
@ -1086,7 +1090,7 @@ def _get_upgradable():
return ret
def list_upgrades(refresh=True):
def list_upgrades(refresh=True, **kwargs):
'''
List all available package upgrades.
@ -1098,7 +1102,7 @@ def list_upgrades(refresh=True):
'''
if salt.utils.is_true(refresh):
refresh_db()
return _get_upgradable()
return _get_upgradable(**kwargs)
def upgrade_available(name):