Merge 60954a0 into 5bee6a7

yast · Nov 11, 2019 · 71c7e1b · 71c7e1b
2 parents 5bee6a7 + 60954a0
commit 71c7e1b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 11 15:22:24 CET 2019 - schubi@suse.de
+
+- Warn the user if no partition has been found due the given
+  skip_list list (bsc#1155576).
+- 3.2.36.2
+
 -------------------------------------------------------------------
 Mon Sep  2 10:03:33 UTC 2019 - Ancor Gonzalez Sosa <ancor@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.2.36.1
+Version:        3.2.36.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/AutoinstStorage.rb b/src/modules/AutoinstStorage.rb
@@ -165,6 +165,7 @@ def set_devices(storage_config)
 
           next { dev => drive }
         end
+        {}
       end
 
       return nil if failed
@@ -1125,12 +1126,18 @@ def Write
       changed = false
       Builtins.foreach(@AutoTargetMap) do |device, data|
         if !tm.has_key?(device) && data.fetch("type",:CT_DISK)==:CT_DISK
-          Report.Error(
-            Builtins.sformat(
-              _("device '%1' not found by storage backend"),
-              device
+          if device && !device.empty?
+            Report.Error(
+              Builtins.sformat(
+                _("device '%1' not found by storage backend"),
+                device
+              )
             )
-          )
+          else
+            Report.Error(
+              Builtins.sformat(_("No suitable device has been found by storage backend"))
+            )
+          end
           Builtins.y2milestone("device %1 not found in TargetMap", device)
         end
         if Storage.IsPartitionable(data)