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

Merge pull request #33549 from thatch45/33530

Browse source 
Fix for #33530
This commit is contained in:
Mike Place 2016-05-26 12:26:00 -07:00
commit 71145ddda7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/yumpkg.py
View file

@ -1333,7 +1333,10 @@ def upgrade(refresh=True,
except MinionError as exc:
raise CommandExecutionError(exc)
targets = [x for x in pkg_params]
if pkg_params:
targets = [x for x in pkg_params]
else:
targets = None
cmd = [_yum(), '--quiet', '-y']
for args in (repo_arg, exclude_arg, branch_arg):
@ -1342,7 +1345,8 @@ def upgrade(refresh=True,
if skip_verify:
cmd.append('--nogpgcheck')
cmd.append('upgrade')
cmd.extend(targets)
if targets:
cmd.extend(targets)
__salt__['cmd.run'](cmd, output_loglevel='trace', python_shell=False)
__context__.pop('pkg.list_pkgs', None)