Merge pull request #59 from yast/show_license_master

yast · May 18, 2021 · 82f0e84 · 82f0e84
2 parents 49ec7c4 + 042a759
commit 82f0e84
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/package/yast2-migration.changes b/package/yast2-migration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 18 11:21:17 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- Show the new base product license in online migration
+  (bsc#1185808)
+- 4.4.1
+
 -------------------------------------------------------------------
 Tue Apr 20 13:51:55 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-migration.spec b/package/yast2-migration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-migration
-Version:        4.4.0
+Version:        4.4.1
 Release:        0
 Summary:        YaST2 - Online migration
 Group:          System/YaST

diff --git a/src/lib/migration/main_workflow.rb b/src/lib/migration/main_workflow.rb
@@ -103,7 +103,11 @@ def run
       "repositories"            => {
         abort:    :abort,
         rollback: "rollback",
-        next:     "proposals"
+        next:     "license"
+      },
+      "license"                 => {
+        abort: "rollback",
+        next:  "proposals"
       },
       "proposals"               => {
         abort: "rollback",
@@ -146,6 +150,7 @@ def aliases
         "perform_migration"       => ->() { perform_migration },
         "proposals"               => ->() { proposals },
         "repositories"            => ->() { repositories },
+        "license"                 => ->() { license },
         "restart_after_migration" => ->() { restart_yast(:restart_after_migration) },
         # note: the steps after the YaST restart use the new code from
         # the updated (migrated) yast2-migration package!!
@@ -198,6 +203,11 @@ def repositories
       Yast::WFM.CallFunction("migration_repos", [{ "enable_back" => false }])
     end
 
+    # display license for the new base product
+    def license
+      Yast::WFM.CallFunction("inst_product_upgrade_license", [{ "enable_back" => false }])
+    end
+
     def proposals
       Yast::WFM.CallFunction("migration_proposals", [{ "hide_export" => true }])
     end

diff --git a/test/main_workflow_test.rb b/test/main_workflow_test.rb
@@ -35,6 +35,7 @@ def mock_client(name, res)
 
     before do
       mock_client(["migration_repos", [{ "enable_back" => false }]], :next)
+      mock_client(["inst_product_upgrade_license", [{ "enable_back" => false }]], :next)
       mock_client(["migration_proposals", [{ "hide_export" => true }]], :next)
       mock_client("inst_prepareprogress", :next)
       mock_client("inst_kickoff", :next)