merged with SP1

yast · Jan 15, 2016 · 56a9a2a · 56a9a2a
2 parents 6da3705 + 140a89a
commit 56a9a2a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 15 10:30:58 CET 2016 - schubi@suse.de
+
+- Installation with "autoyast=default". Fixed nil exception error.
+  (bnc#959723)
+- 3.1.111
+
 -------------------------------------------------------------------
 Thu Jan 14 10:22:53 CET 2016 - schubi@suse.de
 

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

diff --git a/src/include/autoinstall/io.rb b/src/include/autoinstall/io.rb
@@ -181,7 +181,8 @@ def Get(_Scheme, _Host, _Path, _Localfile)
           # The Cdrom entry in install.inf is obsolete. So we are using the
           # entry which is defined in InstUrl module. (bnc#908271)
           install_url = InstURL.installInf2Url("")
-          cdrom_device = install_url ? Builtins.regexpsub(install_url, "devices=(.*)$", "\\1") : ""
+          # Builtins.regexpsub can also return nil (bnc#959723)
+          cdrom_device = install_url ? (Builtins.regexpsub(install_url, "devices=(.*)$", "\\1") || "") : ""
           if Installation.boot == "cd" && !cdrom_device.empty?
             already_mounted = Ops.add(
               Ops.add("grep ", cdrom_device),