Merge 60dbc55 into 57cd2f8

yast · Dec 2, 2021 · 6f1b83d · 6f1b83d
2 parents 57cd2f8 + 60dbc55
commit 6f1b83d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/package/yast2-add-on.changes b/package/yast2-add-on.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec  2 17:06:27 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- Drop support for subscription-tools, that package is not present
+  in SLE15 anymore (bsc#1193339)
+- 4.4.5
+
 -------------------------------------------------------------------
 Fri Nov 26 13:14:28 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-add-on.spec b/package/yast2-add-on.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-add-on
-Version:        4.4.4
+Version:        4.4.5
 Release:        0
 Summary:        YaST2 - Add-On media installation code
 License:        GPL-2.0-only

diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb
@@ -41,7 +41,6 @@ def initialize_add_on_add_on_workflow(include_target)
       Yast.import "SourceDialogs"
       Yast.import "SourceManager"
       Yast.import "PackageSystem"
-      Yast.import "ProductProfile"
       Yast.import "Stage"
       Yast.import "Wizard"
       Yast.import "Confirm"
@@ -706,32 +705,21 @@ def ProductSelect
       ret
     end
 
-    # Check new product compliance; may abort the installation
-    def CheckCompliance
-      compliant = @added_repos.all? { |src_id| ProductProfile.CheckCompliance(src_id) }
-      compliant ? :next : :abort
-    end
-
     def RunWizard
       aliases = {
-        "media"            => -> { MediaSelect() },
-        "install_product"  => -> { InstallProduct() },
-        "check_compliance" => -> { CheckCompliance() }
+        "media"           => -> { MediaSelect() },
+        "install_product" => -> { InstallProduct() }
       }
 
       sequence = {
-        "ws_start"         => "media",
-        "media"            => {
+        "ws_start"        => "media",
+        "media"           => {
           abort:  :abort,
-          next:   "check_compliance",
-          finish: "check_compliance",
+          next:   "install_product",
+          finish: "install_product",
           skip:   :skip
         },
-        "check_compliance" => {
-          abort: :abort,
-          next:  "install_product"
-        },
-        "install_product"  => {
+        "install_product" => {
           abort:  :abort,
           next:   :next,
           finish: :next