Merge pull request #126 from yast/update_renames

Pass product renames to AddOnProduct module
yast · Jul 4, 2014 · c8822cd · c8822cd
2 parents e665274 + 02469b4
commit c8822cd
Show file tree

Hide file tree

Showing 6 changed files with 400 additions and 3 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul  4 15:37:14 UTC 2014 - lslezak@suse.cz
+
+- pass product renames to AddOnProduct module to update the
+  default fallback mapping
+- 3.1.85
+
 -------------------------------------------------------------------
 Fri Jul  4 07:55:33 UTC 2014 - lslezak@suse.cz
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.84
+Version:        3.1.85
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -34,7 +34,7 @@ Requires:       yast2-ruby-bindings >= 3.1.12
 Requires:       rubygem-suse-connect >= 0.2.0
 Requires:       yast2-slp >= 3.1.2
 Requires:       yast2-add-on >= 3.1.8
-Requires:       yast2-packager >= 3.1.22
+Requires:       yast2-packager >= 3.1.27
 
 BuildRequires:  yast2 >= 3.1.26
 BuildRequires:  update-desktop-files
@@ -43,7 +43,7 @@ BuildRequires:  rubygem-yast-rake >= 0.1.8
 BuildRequires:  rubygem-rspec
 BuildRequires:  rubygem-suse-connect >= 0.2.0
 BuildRequires:  yast2-slp >= 3.1.2
-BuildRequires:  yast2-packager >= 3.1.22
+BuildRequires:  yast2-packager >= 3.1.27
 
 BuildArch:      noarch
 

diff --git a/src/lib/registration/registration.rb b/src/lib/registration/registration.rb
@@ -95,6 +95,9 @@ def get_addon_list
       addons = SUSE::Connect::YaST.show_product(remote_product, params).extensions || []
       log.info "Available addons result: #{addons}"
 
+      renames = collect_renames(addons)
+      ::Registration::SwMgmt.update_product_renames(renames)
+
       # ignore the base product "addon"
       addons.reject{ |a| a.identifier == base_product["name"] }
     end
@@ -173,5 +176,19 @@ def connect_params(params)
 
       default_params.merge(params)
     end
+
+    def collect_renames(addons)
+      renames = {}
+
+      addons.each do |addon|
+        if addon.former_identifier && addon.identifier != addon.former_identifier
+          renames[addon.former_identifier] = addon.identifier
+        end
+      end
+
+      log.info "Collected product renames: #{renames}"
+
+      renames
+    end
   end
 end
diff --git a/src/lib/registration/sw_mgmt.rb b/src/lib/registration/sw_mgmt.rb
@@ -30,6 +30,7 @@
 require "registration/helpers"
 
 module Registration
+  Yast.import "AddOnProduct"
   Yast.import "Mode"
   Yast.import "Pkg"
   Yast.import "PackageLock"
@@ -296,6 +297,13 @@ def self.find_addon_updates(addons)
       ret
     end
 
+    # update the static defaults in AddOnProduct module
+    def self.update_product_renames(renames)
+      renames.each do |old_name, new_name|
+        AddOnProduct.add_rename(old_name, new_name)
+      end
+    end
+
     # a helper method for iterating over repositories
     # @param repo_aliases [Array<String>] list of repository aliases
     # @param block block evaluated for each found repository