From 5cfe52591b26eb6b53bac251df34cdf01f320267 Mon Sep 17 00:00:00 2001 From: Doug Luce Date: Sat, 25 Jul 2015 18:50:50 -0700 Subject: [PATCH] Fix pkg.installed using salt:// sources on FreeBSD This just needed a little love. This addresses #25726 --- salt/modules/pkgng.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/modules/pkgng.py b/salt/modules/pkgng.py index 9b6bceb843..3509827cb5 100644 --- a/salt/modules/pkgng.py +++ b/salt/modules/pkgng.py @@ -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: