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 #45552 from rallytime/merge-2017.7-from-.3

Browse source 
[2017.7] Merge forward from 2017.7.3 to 2017.7
This commit is contained in:
Nicole Thomas 2018-01-19 14:12:48 -05:00 • committed by GitHub
commit 42b0d27f71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/pkg.py
View file

@ -1613,14 +1613,10 @@ def installed(
not_modified_hold = None
failed_hold = None
if targets or to_reinstall:
force = False
if salt.utils.is_freebsd():
force = True # Downgrades need to be forced.
try:
pkg_ret = __salt__['pkg.install'](name=None,
refresh=refresh,
version=version,
force=force,
fromrepo=fromrepo,
skip_verify=skip_verify,
pkgs=pkgs,