Hello community,
here is the log from the commit of package yast2-instserver for
openSUSE:Factory checked in at 2018-08-18 00:04:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-instserver (Old)
and /work/SRC/openSUSE:Factory/.yast2-instserver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-instserver"
Sat Aug 18 00:04:05 2018 rev:53 rq:629502 version:4.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-instserver/yast2-instserver.changes
2018-06-29 22:37:26.601947501 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-instserver.new/yast2-instserver.changes
2018-08-18 00:04:08.743083093 +0200
@@ -1,0 +2,7 @@
+Wed Aug 15 13:42:35 UTC 2018 - lsle...@suse.cz
+
+- Do not crash when importing a SLE15 installation medium
+ (bsc#1103621)
+- 4.0.4
+
+-------------------------------------------------------------------
Old:
----
yast2-instserver-4.0.3.tar.bz2
New:
----
yast2-instserver-4.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.zpIRmy/_old 2018-08-18 00:04:09.423085126 +0200
+++ /var/tmp/diff_new_pack.zpIRmy/_new 2018-08-18 00:04:09.427085138 +0200
@@ -17,7 +17,7 @@
Name: yast2-instserver
-Version: 4.0.3
+Version: 4.0.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-instserver-4.0.3.tar.bz2 -> yast2-instserver-4.0.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-instserver-4.0.3/package/yast2-instserver.changes
new/yast2-instserver-4.0.4/package/yast2-instserver.changes
--- old/yast2-instserver-4.0.3/package/yast2-instserver.changes 2018-06-29
16:37:13.000000000 +0200
+++ new/yast2-instserver-4.0.4/package/yast2-instserver.changes 2018-08-16
10:09:53.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Aug 15 13:42:35 UTC 2018 - lsle...@suse.cz
+
+- Do not crash when importing a SLE15 installation medium
+ (bsc#1103621)
+- 4.0.4
+
+-------------------------------------------------------------------
Wed Jun 27 12:24:50 CEST 2018 - sch...@suse.de
- Added additional searchkeys to desktop file (fate#321043).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.0.3/package/yast2-instserver.spec
new/yast2-instserver-4.0.4/package/yast2-instserver.spec
--- old/yast2-instserver-4.0.3/package/yast2-instserver.spec 2018-06-29
16:37:13.000000000 +0200
+++ new/yast2-instserver-4.0.4/package/yast2-instserver.spec 2018-08-16
10:09:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-instserver
-Version: 4.0.3
+Version: 4.0.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-instserver-4.0.3/src/include/instserver/dialogs.rb
new/yast2-instserver-4.0.4/src/include/instserver/dialogs.rb
--- old/yast2-instserver-4.0.3/src/include/instserver/dialogs.rb
2018-06-29 16:37:13.000000000 +0200
+++ new/yast2-instserver-4.0.4/src/include/instserver/dialogs.rb
2018-08-16 10:09:53.000000000 +0200
@@ -388,18 +388,17 @@
)
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, "") != "" &&
