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

Merge pull request #25727 from dougluce/pkgng-fix-add

Browse Source 
Fix pkg.installed using salt:// sources on FreeBSD
This commit is contained in:
Justin Findlay 2015-07-26 20:14:29 -06:00
commit a9da4d54c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/pkgng.py
View File

@ -725,7 +725,7 @@ def install(name=None,
opts += 'U'
if salt.utils.is_true(dryrun):
opts += 'n'
if not salt.utils.is_true(dryrun):
if not salt.utils.is_true(dryrun) and pkg_type != 'file':
opts += 'y'
if salt.utils.is_true(quiet):
opts += 'q'
@ -746,7 +746,7 @@ def install(name=None,
if pkg_type == 'file':
pkg_cmd = 'add'
targets = list(pkg_params.keys())
targets = pkg_params
elif pkg_type == 'repository':
pkg_cmd = 'install'
if pkgs is None and kwargs.get('version') and len(pkg_params) == 1: