Merge pull request #11970 from chef/snehal/fix_version_comparisons_on_upgrade

3 files changed, 33 insertions, 0 deletions

diff --git a/lib/chef/resource/dpkg_package.rb b/lib/chef/resource/dpkg_package.rb
index 1ad460e591..143aaee699 100644
--- a/lib/chef/resource/dpkg_package.rb
+++ b/lib/chef/resource/dpkg_package.rb
@@ -37,6 +37,11 @@ class Chef
       property :response_file_variables, Hash,
         description: "A Hash of response file variables in the form of {'VARIABLE' => 'VALUE'}.",
         default: {}, desired_state: false
+
+      property :allow_downgrade, [ TrueClass, FalseClass ],
+              description: "Allow downgrading a package to satisfy requested version requirements.",
+              default: true,
+              desired_state: false
     end
   end
 end
diff --git a/spec/functional/resource/dpkg_package_spec.rb b/spec/functional/resource/dpkg_package_spec.rb
index 0a8202127c..280a5983e4 100644
--- a/spec/functional/resource/dpkg_package_spec.rb
+++ b/spec/functional/resource/dpkg_package_spec.rb
@@ -184,6 +184,22 @@ describe Chef::Resource::DpkgPackage, :requires_root, :debian_family_only, arch:
       dpkg_package.run_action(action)
       expect(dpkg_package).to be_updated_by_last_action
     end
+
+    it "should not allow downgrade a package" do
+      dpkg_package.allow_downgrade false
+      shell_out!("dpkg -i #{test1_1}")
+      set_dpkg_package_name test1_0
+      dpkg_package.run_action(action)
+      expect(dpkg_package).not_to be_updated_by_last_action
+    end
+
+    it "should allow downgrade a package" do
+      dpkg_package.allow_downgrade true
+      shell_out!("dpkg -i #{test1_1}")
+      set_dpkg_package_name test1_0
+      dpkg_package.run_action(action)
+      expect(dpkg_package).to be_updated_by_last_action
+    end
   end
 
   shared_examples_for "common behavior for remove or purge" do
diff --git a/spec/unit/resource/dpkg_package_spec.rb b/spec/unit/resource/dpkg_package_spec.rb
index acd879597d..9ff752f11e 100644
--- a/spec/unit/resource/dpkg_package_spec.rb
+++ b/spec/unit/resource/dpkg_package_spec.rb
@@ -57,4 +57,16 @@ describe Chef::Resource::DpkgPackage, "initialize" do
     end
   end
 
+  describe Chef::Resource::DpkgPackage, "allow_downgrade" do
+    before(:each) do
+      @resource = Chef::Resource::DpkgPackage.new("fakey_fakerton")
+    end
+
+    it "should allow you to specify whether allow_downgrade is true or false" do
+      expect { @resource.allow_downgrade true }.not_to raise_error
+      expect { @resource.allow_downgrade false }.not_to raise_error
+      expect { @resource.allow_downgrade "something" }.to raise_error(ArgumentError)
+    end
+  end
+
 end