Fix registration

package/yast2-registration.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 11 08:49:16 UTC 2017 - jreidinger@suse.com
+
+- Fixed registration of autoselected extensions (bsc#1062684)
+- 4.0.4
+
 -------------------------------------------------------------------
 Tue Oct 10 08:19:27 UTC 2017 - lslezak@suse.cz
 

package/yast2-registration.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.0.3
+Version:        4.0.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/lib/registration/addon.rb

@@ -80,6 +80,27 @@ def registered_not_installed
         end
       end
 
+      # Returns passed addons sorted with all dependencies ordered that it can be
+      # registered from first to last ( so no dependencies for first ).
+      # @param list [Array<Addon>] of addons
+      def registration_order(list)
+        to_process = list.dup
+        result = []
+
+        loop do
+          break if to_process.empty?
+          next_addon = to_process.find do |addon|
+            addon.depends_on.nil? || !to_process.include?(addon.depends_on)
+          end
+          raise "circular dependencies found in addons #{to_process.inspect}" unless next_addon
+
+          result << next_addon
+          to_process.delete(next_addon)
+        end
+
+        result
+      end
+
     private
 
       # create an Addon from a SUSE::Connect::Product
@@ -234,6 +255,7 @@ def registered?
     # mark the add-on as registered
     def registered
       Addon.registered << self unless registered?
+      unselected # if register then mark as no longer selected as register is different state
     end
 
     # just internally mark the addon as NOT registered, not a real unregistration

src/lib/registration/clients/inst_scc.rb

@@ -169,7 +169,9 @@ def get_available_addons
     # back returns directly to the extensions selection
     def register_addons
       return false if init_registration == :cancel
-      ret = registration_ui.register_addons(@selected_addons, @known_reg_codes)
+      addons = Registration::Addon.selected + Registration::Addon.auto_selected
+      addons = Registration::Addon.registration_order(addons)
+      ret = registration_ui.register_addons(addons, @known_reg_codes)
       ret = :extensions if ret == :back
       ret
     end
@@ -212,7 +214,8 @@ def registration_check
 
     # display EULAs for the selected addons
     def addon_eula
-      ::Registration::UI::AddonEulaDialog.run(@selected_addons)
+      new_addons = Registration::Addon.selected + Registration::Addon.auto_selected
+      ::Registration::UI::AddonEulaDialog.run(new_addons)
     end
 
     # remember the user entered values so they can be stored to the AutoYast

test/addon_spec.rb

@@ -78,6 +78,19 @@
     end
   end
 
+  describe ".registration_order" do
+    it "returns addons sorted in the registration order" do
+      addons = load_yaml_fixture("sle15_addons.yaml")
+      sorted_addons = Registration::Addon.registration_order(addons)
+      expected_output = ["sle-module-basesystem", "sle-ha", "sle-we", "sle-module-legacy",
+                         "sle-module-scripting", "sle-module-desktop-applications",
+                         "sle-module-development-tools", "sle-module-server-applications"]
+
+      expect(addons.size).to eq sorted_addons.size
+      expect(sorted_addons.map(&:identifier)).to eq expected_output
+    end
+  end
+
   describe ".selected" do
     it "returns array with selected addons" do
       expect(Registration::Addon.selected).to be_a(Array)