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 branch '2017.7.3' into 2017.7.3

Browse source
This commit is contained in:
Daniel Wallace 2018-01-18 17:49:19 -07:00 • committed by GitHub
commit 801e0639b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -538,6 +538,7 @@ def install(name=None,
cmd.extend(['systemd-run', '--scope'])
cmd.append('pacman')
targets = []
errors = []
if pkg_type == 'file':
cmd.extend(['-U', '--noprogressbar', '--noconfirm'])
@ -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: