Merge 154c347 into 21ffae2

yast · Nov 18, 2021 · 252f4c7 · 252f4c7
2 parents 21ffae2 + 154c347
commit 252f4c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 18 10:22:49 UTC 2021 - David Diaz <dgonzalez@suse.com>
+
+- Fix duplicate PV error detection with disabled multipath
+  (related to bsc#1170216).
+
 -------------------------------------------------------------------
 Wed Nov 17 13:31:47 UTC 2021 - Ancor Gonzalez Sosa <ancor@suse.com>
 

diff --git a/src/lib/y2storage/callbacks/libstorage_callback.rb b/src/lib/y2storage/callbacks/libstorage_callback.rb
@@ -118,7 +118,7 @@ def default_answer_to_error
       # @param what [String] details coming from libstorage-ng
       # @return [String]
       def error_description(what)
-        if what.match?(/WARNING: PV .* was already found on .*/i)
+        if what.match?(/Cannot activate LVs in VG .* while PVs appear on duplicate devices/i)
           duplicated_pv_description
         else
           _("Unexpected situation found in the system.")

diff --git a/test/y2storage/callbacks/callbacks_examples.rb b/test/y2storage/callbacks/callbacks_examples.rb
@@ -95,7 +95,7 @@
 
         stderr:
           WARNING: Failed to connect to lvmetad. Falling back to device scanning.
-          WARNING: PV uecMW2-1Qgu-b367-WBKL-uM2h-BRDB-nYva0a on /dev/sda4 was already found on /dev/sda2.
+          WARNING: Not using device /dev/sda4 for PV uecMW2-1Qgu-b367-WBKL-uM2h-BRDB-nYva0a.
           WARNING: PV uecMW2-1Qgu-b367-WBKL-uM2h-BRDB-nYva0a prefers device /dev/sda2 because device size is correct.
           Cannot activate LVs in VG vg0 while PVs appear on duplicate devices.