Also accept Packages.db as valid rpm database (bsc#1162485)

- 4.2.15
yast · Feb 17, 2020 · 1defd06 · 1defd06
1 parent 9f3eec6
commit 1defd06
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 17 15:43:57 CET 2020 - mls@suse.de
+
+- Also accept Packages.db as valid rpm database (bsc#1162485)
+- 4.2.15
+
 -------------------------------------------------------------------
 Tue Jan 28 10:23:51 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        4.2.14
+Version:        4.2.15
 Release:        0
 Summary:        YaST2 - Update
 Group:          System/YaST

diff --git a/src/clients/update_proposal.rb b/src/clients/update_proposal.rb
@@ -286,7 +286,11 @@ def CheckRPMDBforExistency
       )
 
       # at least one must be there, the second one is for RPM v3
-      rpm_db_files = ["/var/lib/rpm/Packages", "/var/lib/rpm/packages.rpm"]
+      rpm_db_files = [
+        "/var/lib/rpm/Packages",
+        "/var/lib/rpm/packages.rpm",
+        "/var/lib/rpm/Packages.db"
+      ]
       ret = false
       file_found_or_error_skipped = false