Hello community,
here is the log from the commit of package yast2-live-installer for
openSUSE:Factory checked in at 2016-02-26 22:19:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-live-installer (Old)
and /work/SRC/openSUSE:Factory/.yast2-live-installer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-live-installer"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-live-installer/yast2-live-installer.changes
2016-01-26 10:14:55.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-live-installer.new/yast2-live-installer.changes
2016-02-26 22:19:33.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Jan 26 18:52:20 UTC 2016 - [email protected]
+
+- fix replacing symlinks to /livecd/* by their target file/directory
+- 3.1.6
+
+-------------------------------------------------------------------
Old:
----
yast2-live-installer-3.1.5.tar.bz2
New:
----
yast2-live-installer-3.1.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-live-installer.spec ++++++
--- /var/tmp/diff_new_pack.fYJYYk/_old 2016-02-26 22:19:35.000000000 +0100
+++ /var/tmp/diff_new_pack.fYJYYk/_new 2016-02-26 22:19:35.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-live-installer
-Version: 3.1.5
+Version: 3.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-live-installer-3.1.5.tar.bz2 -> yast2-live-installer-3.1.6.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-live-installer-3.1.5/package/yast2-live-installer.changes
new/yast2-live-installer-3.1.6/package/yast2-live-installer.changes
--- old/yast2-live-installer-3.1.5/package/yast2-live-installer.changes
2016-01-22 10:56:14.000000000 +0100
+++ new/yast2-live-installer-3.1.6/package/yast2-live-installer.changes
2016-02-25 17:18:19.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 26 18:52:20 UTC 2016 - [email protected]
+
+- fix replacing symlinks to /livecd/* by their target file/directory
+- 3.1.6
+
+-------------------------------------------------------------------
Wed Jan 13 18:37:12 UTC 2016 - [email protected]
- dropped unused inst client
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-live-installer-3.1.5/package/yast2-live-installer.spec
new/yast2-live-installer-3.1.6/package/yast2-live-installer.spec
--- old/yast2-live-installer-3.1.5/package/yast2-live-installer.spec
2016-01-22 10:56:14.000000000 +0100
+++ new/yast2-live-installer-3.1.6/package/yast2-live-installer.spec
2016-02-25 17:18:19.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-live-installer
-Version: 3.1.5
+Version: 3.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-live-installer-3.1.5/src/clients/inst_live_doit.rb
new/yast2-live-installer-3.1.6/src/clients/inst_live_doit.rb
--- old/yast2-live-installer-3.1.5/src/clients/inst_live_doit.rb
2015-04-17 10:02:12.000000000 +0200
+++ new/yast2-live-installer-3.1.6/src/clients/inst_live_doit.rb
2016-02-25 17:18:19.000000000 +0100
@@ -30,6 +30,7 @@
Yast.import "Pkg"
textdomain "live-installer"
+ Yast.import "FileUtils"
Yast.import "Installation"
Yast.import "Progress"
Yast.import "Wizard"
@@ -92,13 +93,9 @@
# Find symlinks which need to be resolved and copied
# @return a list of such symlinks
def LinksToCopyList
- cmd = Builtins.sformat(
- "\n" +
- "\tfor LINK in `find %1 -xdev -type l` ; do\n" +
- "\t stat -c \"%%N\" $LINK |grep livecd >/dev/null 2>/dev/null &&
echo $LINK;\n" +
- "\tdone; exit 0",
- Installation.destdir
- )
+ cmd = "\tfor LINK in `find / -xdev -type l` ; do\n" +
+ "\t stat -c \"%N\" $LINK |grep livecd >/dev/null 2>/dev/null &&
echo $LINK;\n" +
+ "\tdone; exit 0"
Builtins.y2milestone("Executing %1", cmd)
out = Convert.to_map(SCR.Execute(path(".target.bash_output"), cmd))
Builtins.y2milestone("Result: %1", out)
@@ -168,12 +165,19 @@
# components[size(components) - 1] = "";
# link = mergestring (components, "/");
progress_done = Ops.add(progress_start, progress_step)
- ret = ImageInstallation.FileSystemCopy(
- Ops.add("/", target),
- Builtins.sformat("%1/%2", Installation.destdir, link),
- progress_start,
- progress_done
- ) && ret
+ if FileUtils.IsDirectory(target)
+ ret = ImageInstallation.FileSystemCopy(
+ Ops.add("/", target),
+ Builtins.sformat("%1/%2", Installation.destdir, link),
+ progress_start,
+ progress_done
+ ) && ret
+ else
+ SCR.Execute(
+ path(".target.bash"),
+ Builtins.sformat("/bin/cp -a %1 %2/%3", target,
Installation.destdir, link)
+ )
+ end
progress_start = progress_done
# Progress::Step (progress_start);
SlideShow.StageProgress(progress_done, nil)
