diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-11-17 23:21:16 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2021-11-17 23:21:16 -0800 |
commit | fb92919350ed662a38491c196822440f650d7cf0 (patch) | |
tree | 3643a0ca7d17fc6d6224b4d4aa5a1ef535069037 | |
parent | 47d450a1799de2ea0d01ac9833b224bacc0e24a6 (diff) | |
download | chef-fb92919350ed662a38491c196822440f650d7cf0.tar.gz |
Fix allow_downgrade for :install
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r-- | lib/chef/provider/package.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb index 5ec83d78f4..18e73ab03e 100644 --- a/lib/chef/provider/package.rb +++ b/lib/chef/provider/package.rb @@ -467,13 +467,13 @@ class Chef end when :install - if new_version && !use_magic_version? + if current_version && new_version && !allow_downgrade && version_compare(current_version, new_version) == 1 + logger.warn("#{new_resource} #{package_name} has installed version #{current_version}, which is newer than available version #{new_version}. Skipping...)") + target_version_array.push(nil) + elsif new_version && !use_magic_version? if version_requirement_satisfied?(current_version, new_version) logger.trace("#{new_resource} #{package_name} #{current_version} satisfies #{new_version} requirement") target_version_array.push(nil) - elsif current_version && !allow_downgrade && version_compare(current_version, new_version) == 1 - logger.warn("#{new_resource} #{package_name} has installed version #{current_version}, which is newer than available version #{new_version}. Skipping...)") - target_version_array.push(nil) else logger.trace("#{new_resource} #{package_name} #{current_version} needs updating to #{new_version}") target_version_array.push(new_version) |