making more robust

yast · Jan 16, 2015 · b525a25 · b525a25
1 parent 0743dd2
commit b525a25
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/include/autoinstall/io.rb b/src/include/autoinstall/io.rb
@@ -181,8 +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("")
-          if Installation.boot == "cd" && install_url
-            cdrom_device = Builtins.regexpsub(install_url, "devices=(.*)$", "\\1")
+          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),
               " /proc/mounts ;"