Merge pull request #252 from yast/sp3_merge

Merge SP3 to master (with bsc#1048141 fix)
yast · Jul 11, 2017 · 2bb6dcd · 2bb6dcd
2 parents 3befed1 + 934c75e
commit 2bb6dcd
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 3 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 11 14:41:58 UTC 2017 - lslezak@suse.cz
+
+- Properly handle multiple product renames (bsc#1048141)
+- 3.2.24
+
 -------------------------------------------------------------------
 Fri Apr 28 08:45:31 UTC 2017 - jreidinger@suse.com
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.2.23
+Version:        3.2.24
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/AddOnProduct.rb b/src/modules/AddOnProduct.rb
@@ -2335,8 +2335,8 @@ def product_name_from_dep(dependency)
     def add_rename_to_hash(renames, old_name, new_name)
       return renames if old_name == new_name || renamed_at?(renames, old_name, new_name)
       log.info "Adding product rename: '#{old_name}' => '#{new_name}'"
-      renames.merge(old_name => new_name) do |key, old_val, new_val|
-        old_val.nil? ? [new_val] : old_val + [new_val]
+      renames.merge(old_name => [new_name]) do |key, old_val, new_val|
+        old_val.nil? ? [new_val] : old_val + new_val
       end
     end
 

diff --git a/test/addon_product_test.rb b/test/addon_product_test.rb
@@ -65,6 +65,11 @@
   end
 
   describe "#add_rename" do
+    before do
+      # reset the known renames for each test
+      subject.main
+    end
+
     it "adds a new product rename" do
       expect(Yast::AddOnProduct.renamed?("FOO", "BAR")).to eq(false)
       Yast::AddOnProduct.add_rename("FOO", "BAR")
@@ -79,6 +84,54 @@
       # check the already known rename
       expect(Yast::AddOnProduct.renamed?("SUSE_SLES", "SLES")).to eq(true)
     end
+
+    it "handles single rename" do
+      # not known yet
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES")).to eq(false)
+      # add a single rename
+      Yast::AddOnProduct.add_rename("SUSE_SLE", "SLES")
+
+      # the rename is known
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES")).to eq(true)
+      # the rest is unknown
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_SAP")).to eq(false)
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_NEW")).to eq(false)
+    end
+
+    # handle correctly double renames (bsc#1048141)
+    it "handles double rename" do
+      # not known yet
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES")).to eq(false)
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_SAP")).to eq(false)
+
+      # add several renames
+      Yast::AddOnProduct.add_rename("SUSE_SLE", "SLES")
+      Yast::AddOnProduct.add_rename("SUSE_SLE", "SLES_SAP")
+
+      # the renames are known
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES")).to eq(true)
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_SAP")).to eq(true)
+      # the rest is unknown
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_NEW")).to eq(false)
+    end
+
+    # handle correctly multiple renames
+    it "handles multiple renames" do
+      # not known yet
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES")).to eq(false)
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_SAP")).to eq(false)
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_NEW")).to eq(false)
+
+      # add several renames
+      Yast::AddOnProduct.add_rename("SUSE_SLE", "SLES")
+      Yast::AddOnProduct.add_rename("SUSE_SLE", "SLES_SAP")
+      Yast::AddOnProduct.add_rename("SUSE_SLE", "SLES_NEW")
+
+      # all renames are known
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES")).to eq(true)
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_SAP")).to eq(true)
+      expect(Yast::AddOnProduct.renamed?("SUSE_SLE", "SLES_NEW")).to eq(true)
+    end
   end
 
   describe "#SetRepoUrlAlias" do