valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into patch-1

Browse Source
This commit is contained in:
Nicole Thomas 2017-08-30 10:20:11 -04:00 committed by GitHub
commit f6926bf95c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/pacman.py
View File

@ -539,6 +539,7 @@ def install(name=None,
cmd.append('pacman')
errors = []
targets = []
if pkg_type == 'file':
cmd.extend(['-U', '--noprogressbar', '--noconfirm'])
cmd.extend(pkg_params)
@ -549,7 +550,6 @@ def install(name=None,
if sysupgrade:
cmd.append('-u')
cmd.extend(['--noprogressbar', '--noconfirm', '--needed'])
targets = []
wildcards = []
for param, version_num in six.iteritems(pkg_params):
if version_num is None: