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 #29909 from abednarik/freebsd_pkgng_non_interactive_fix

Browse source 
FreeBSD pkgng fix for non-interactive install.
This commit is contained in:
Mike Place 2015-12-22 08:03:50 -07:00
commit ad0de4d563
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/pkgng.py
View file

@ -730,7 +730,7 @@ def install(name=None,
if pkg_params is None or len(pkg_params) == 0:
return {}
opts = ''
opts = 'y'
repo_opts = ''
if salt.utils.is_true(orphan):
opts += 'A'
@ -742,8 +742,6 @@ def install(name=None,
opts += 'U'
if salt.utils.is_true(dryrun):
opts += 'n'
if not salt.utils.is_true(dryrun):
opts += 'y'
if salt.utils.is_true(quiet):
opts += 'q'
if salt.utils.is_true(reinstall_requires):