mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Merge pull request #45529 from Ch3LL/pacman-sources
Fix UnboundLocalError for pacman pkg installs
This commit is contained in:
commit
5e26282843
@ -538,6 +538,7 @@ def install(name=None,
|
|||||||
cmd.extend(['systemd-run', '--scope'])
|
cmd.extend(['systemd-run', '--scope'])
|
||||||
cmd.append('pacman')
|
cmd.append('pacman')
|
||||||
|
|
||||||
|
targets = []
|
||||||
errors = []
|
errors = []
|
||||||
if pkg_type == 'file':
|
if pkg_type == 'file':
|
||||||
cmd.extend(['-U', '--noprogressbar', '--noconfirm'])
|
cmd.extend(['-U', '--noprogressbar', '--noconfirm'])
|
||||||
@ -549,7 +550,6 @@ def install(name=None,
|
|||||||
if sysupgrade:
|
if sysupgrade:
|
||||||
cmd.append('-u')
|
cmd.append('-u')
|
||||||
cmd.extend(['--noprogressbar', '--noconfirm', '--needed'])
|
cmd.extend(['--noprogressbar', '--noconfirm', '--needed'])
|
||||||
targets = []
|
|
||||||
wildcards = []
|
wildcards = []
|
||||||
for param, version_num in six.iteritems(pkg_params):
|
for param, version_num in six.iteritems(pkg_params):
|
||||||
if version_num is None:
|
if version_num is None:
|
||||||
|
Loading…
Reference in New Issue
Block a user