Merge pull request #7953 from chef/lcg/chef-15-allow-downgrade

Chef-15: switch default of allow_downgrade to true

6 files changed, 12 insertions, 5 deletions

diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb
index e991e4541e..ad045c77e6 100644
--- a/lib/chef/provider/package/yum.rb
+++ b/lib/chef/provider/package/yum.rb
@@ -96,7 +96,7 @@ class Chef
 
             name = av.name # resolve the name via the available/candidate version
 
-            iv = python_helper.package_query(:whatinstalled, name)
+            iv = python_helper.package_query(:whatinstalled, av.name_with_arch)
 
             method = "install"
 
diff --git a/lib/chef/provider/package/yum/version.rb b/lib/chef/provider/package/yum/version.rb
index b19f52fe09..6ff59009f9 100644
--- a/lib/chef/provider/package/yum/version.rb
+++ b/lib/chef/provider/package/yum/version.rb
@@ -40,6 +40,10 @@ class Chef
             "#{version}.#{arch}" unless version.nil?
           end
 
+          def name_with_arch
+            "#{name}.#{arch}" unless name.nil?
+          end
+
           def matches_name_and_arch?(other)
             other.version == version && other.arch == arch
           end
diff --git a/lib/chef/resource/package.rb b/lib/chef/resource/package.rb
index 670671e22b..71f030244b 100644
--- a/lib/chef/resource/package.rb
+++ b/lib/chef/resource/package.rb
@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/chef/resource/rpm_package.rb b/lib/chef/resource/rpm_package.rb
index 4d79ba98d1..cf408cd094 100644
--- a/lib/chef/resource/rpm_package.rb
+++ b/lib/chef/resource/rpm_package.rb
@@ -26,7 +26,7 @@ class Chef
 
       description "Use the rpm_package resource to manage packages for the RPM Package Manager platform."
 
-      property :allow_downgrade, [ true, false ], default: false, desired_state: false
+      property :allow_downgrade, [ true, false ], default: true, desired_state: false
 
     end
   end
diff --git a/lib/chef/resource/yum_package.rb b/lib/chef/resource/yum_package.rb
index f0ea7dbf50..602fe489fb 100644
--- a/lib/chef/resource/yum_package.rb
+++ b/lib/chef/resource/yum_package.rb
@@ -69,7 +69,8 @@ class Chef
 
       property :allow_downgrade, [ true, false ],
                description: "Downgrade a package to satisfy requested version requirements.",
-               default: false
+               default: true,
+               desired_state: false
 
       property :yum_binary, String
     end
diff --git a/lib/chef/resource/zypper_package.rb b/lib/chef/resource/zypper_package.rb
index f31dbe2f93..c8d776cebb 100644
--- a/lib/chef/resource/zypper_package.rb
+++ b/lib/chef/resource/zypper_package.rb
@@ -33,7 +33,9 @@ class Chef
 
       property :allow_downgrade, [ TrueClass, FalseClass ],
                description: "Allow downgrading a package to satisfy requested version requirements.",
-               default: false, introduced: "13.6"
+               default: true,
+               desired_state: false,
+               introduced: "13.6"
 
       property :global_options, [ String, Array ],
                description: "One (or more) additional command options that are passed to the command. For example, common zypper directives, such as '--no-recommends'. See the zypper man page at https://en.opensuse.org/SDB:Zypper_manual_(plain) for the full list.",