Merge 3ba39cc into 0cc5361

yast · Mar 12, 2020 · 03c480e · 03c480e
2 parents 0cc5361 + 3ba39cc
commit 03c480e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/library/packages/src/lib/y2packager/original_repository_setup.rb b/library/packages/src/lib/y2packager/original_repository_setup.rb
@@ -38,8 +38,11 @@ def initialize
     end
 
     # Read and store the current repository/service setup.
-    def read
-      @repositories = Repository.all
+    # @param installation_repositories [Array<Y2Packager::Repository>]
+    def read(installation_repositories = [])
+      # skip the installation repositories, we need to keep them
+      aliases = installation_repositories.map(&:repo_alias)
+      @repositories = Repository.all.reject { |r| aliases.include?(r.repo_alias) }
       @services = Service.all
       log.info("Found #{repositories.size} repositories and #{services.size} services")
     end

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 12 08:26:12 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
+
+- Do not remove the installation repositories in the "Previously
+  Used Repositories" step (bsc#1163081)
+- 4.2.71
+
 -------------------------------------------------------------------
 Fri Mar  6 13:26:57 UTC 2020 - David Diaz <dgonzalez@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.2.70
+Version:        4.2.71
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only