Merge pull request #416 from yast/fixed_restart

yast · Jan 17, 2019 · eb4b294 · eb4b294
2 parents fd89e9f + 47c21ab
commit eb4b294
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 17 15:08:40 UTC 2019 - lslezak@suse.cz
+
+- Save the current repository configuration so it is properly
+  restored after restarting the package manager (bsc#1122011)
+- 4.1.14
+
 -------------------------------------------------------------------
 Wed Jan 16 08:53:13 UTC 2019 - lslezak@suse.cz
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        4.1.13
+Version:        4.1.14
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/registration/sw_mgmt.rb b/src/lib/registration/sw_mgmt.rb
@@ -676,6 +676,8 @@ def self.target_distribution(destdir)
       target_distro = base_products ? base_products.first["register_target"] : ""
       log.info "Base product target distribution: #{target_distro.inspect}"
 
+      # Save the current repositories so they are not lost
+      Pkg.SourceSaveAll
       # close both target and sources to fully reinitialize later
       Pkg.SourceFinishAll
       Pkg.TargetFinish