restore the repository setup

yast · Sep 4, 2015 · a8dd65f · a8dd65f
1 parent d4cf56c
commit a8dd65f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/package/yast2-migration.spec b/package/yast2-migration.spec
@@ -40,7 +40,7 @@ Requires:	yast2-packager
 Requires:	yast2-pkg-bindings
 Requires:       yast2-ruby-bindings
 # new registration with migration support
-Requires:       yast2-registration >= 3.1.135
+Requires:       yast2-registration >= 3.1.147
 # need recent enough installation for working proposal runner
 Requires:       yast2-installation >= 3.1.146
 Requires:       yast2-update

diff --git a/src/lib/migration/main_workflow.rb b/src/lib/migration/main_workflow.rb
@@ -69,7 +69,7 @@ def run
       "ws_start"             => "start",
       "start"                => {
         start:   "create_pre_snapshot",
-        restart: "create_post_snapshot"
+        restart: "migration_finish"
       },
       "create_pre_snapshot"  => {
         next: "create_backup"
@@ -97,6 +97,10 @@ def run
       },
       # note: the steps after the YaST restart use the new code from
       # the updated (migrated) yast2-migration package!!
+      "migration_finish"     => {
+        abort: :abort,
+        next:  "create_post_snapshot"
+      },
       "create_post_snapshot" => {
         next: "finish_dialog"
       },
@@ -118,6 +122,7 @@ def aliases
         "restart_yast"         => ->() { restart_yast },
         # note: the steps after the YaST restart use the new code from
         # the updated (migrated) yast2-migration package!!
+        "migration_finish"     => ->() { migration_finish },
         "create_post_snapshot" => ->() { create_post_snapshot },
         "finish_dialog"        => ->() { finish_dialog }
       }
@@ -175,6 +180,10 @@ def create_post_snapshot
       :next
     end
 
+    def migration_finish
+      Yast::WFM.CallFunction("migration_finish")
+    end
+
     # check whether snapper is configured
     # @return [Boolean] true if snapper is configured
     def snapper_configured?

diff --git a/src/lib/migration/proposal_client.rb b/src/lib/migration/proposal_client.rb
@@ -178,6 +178,9 @@ def disable_repo(link)
 
       log.info "Disabling repository #{repo}"
       Pkg.SourceSetEnabled(repo, false)
+
+      # disable the old repo permanently to not possibly mess the system later
+      Pkg.SourceSaveAll
     end
 
     # proposal help text

diff --git a/test/main_workflow_test.rb b/test/main_workflow_test.rb
@@ -39,6 +39,7 @@ def mock_client(name, res)
       mock_client("inst_prepareprogress", :next)
       mock_client("inst_kickoff", :next)
       mock_client("inst_rpmcopy", :next)
+      mock_client("migration_finish", :next)
 
       allow(Yast::Update).to receive(:clean_backup)
       allow(Yast::Update).to receive(:create_backup)