Merge pull request #23 from yast/sle15_support

Fixed importing a SLE15 installation medium (bsc#1103621)
yast · Aug 15, 2018 · 0aca1c5 · 0aca1c5
2 parents 46d1a53 + 4aefea4
commit 0aca1c5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,8 @@ Makefile.am.common
 tmp.*
 *.log
 *.ybc
+/.yardoc
+/doc
+!/doc/SPEC
+*.exp
+runtest.sh
diff --git a/package/yast2-instserver.changes b/package/yast2-instserver.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 15 13:42:35 UTC 2018 - lslezak@suse.cz
+
+- Do not crash when importing a SLE15 installation medium
+  (bsc#1103621)
+- 3.1.6
+
 -------------------------------------------------------------------
 Wed Jun  1 13:58:26 UTC 2016 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-instserver.spec b/package/yast2-instserver.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-instserver
-Version:        3.1.5
+Version:        3.1.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/instserver/dialogs.rb b/src/include/instserver/dialogs.rb
@@ -388,18 +388,17 @@ def CopyCDs(dir, stype, iso, promptmore, cddrive)
             )
           end
 
-          content = ReadContentFile(Ops.add(cdpath, "/content"))
+          content_path = File.join(cdpath, "content")
+          content = ReadContentFile(content_path) if File.exist?(content_path)
           Builtins.y2milestone("Content file: %1", content)
           # don't rewrite the already read content file,
           # content file from CORE9 would rewrite already read file from SLES9
           if current_cd == 1 && content_first_CD == ""
             Builtins.y2milestone(
               "Reading content file %1",
-              Ops.add(cdpath, "/content")
-            )
-            content_first_CD = Convert.to_string(
-              SCR.Read(path(".target.string"), Ops.add(cdpath, "/content"))
+              content_path
             )
+            content_first_CD = File.read(content_path) if File.exist?(content_path)
             Builtins.y2debug("content file: %1", content_first_CD)
           end
           if Ops.get(media, 2, "") != "" &&