[yast-commit] [ci_new_pac] JFYI yast2-packager -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-packager -> sle12 ## BNC# 852436 : "Impossible to add DVD ISO image as source" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-02-26 16:44:14.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-02-28 15:06:59.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 28 13:24:48 UTC 2014 - jreidinger@suse.com + +- Fix iso detection for DVD capable UEFI boot(BNC#852436) +- 3.1.6 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 24 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:33664 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.5.tar.bz2 New: ---- yast2-packager-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.r8w9ET/_old 2014-02-28 16:04:13.000000000 +0100 +++ /var/tmp/diff_new_pack.r8w9ET/_new 2014-02-28 16:04:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.5.tar.bz2 -> yast2-packager-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.5/package/yast2-packager.changes new/yast2-packager-3.1.6/package/yast2-packager.changes --- old/yast2-packager-3.1.5/package/yast2-packager.changes 2014-02-26 15:54:57.000000000 +0100 +++ new/yast2-packager-3.1.6/package/yast2-packager.changes 2014-02-28 15:03:29.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 28 13:24:48 UTC 2014 - jreidinger@suse.com + +- Fix iso detection for DVD capable UEFI boot(BNC#852436) +- 3.1.6 + +------------------------------------------------------------------- Wed Feb 26 14:46:40 UTC 2014 - lslezak@suse.cz - Always prefer DVD medium to download (not only during update) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.5/package/yast2-packager.spec new/yast2-packager-3.1.6/package/yast2-packager.spec --- old/yast2-packager-3.1.5/package/yast2-packager.spec 2014-02-26 15:54:57.000000000 +0100 +++ new/yast2-packager-3.1.6/package/yast2-packager.spec 2014-02-28 15:03:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -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-packager-3.1.5/src/modules/SourceDialogs.rb new/yast2-packager-3.1.6/src/modules/SourceDialogs.rb --- old/yast2-packager-3.1.5/src/modules/SourceDialogs.rb 2014-02-26 15:54:57.000000000 +0100 +++ new/yast2-packager-3.1.6/src/modules/SourceDialogs.rb 2014-02-28 15:03:29.000000000 +0100 @@ -910,13 +910,15 @@ file = "/usr/bin/file" # try to detect ISO image by file if it's present if Ops.greater_than(SCR.Read(path(".target.size"), file), 0) - command = Builtins.sformat("%1 -b -- '%2'", file, String.Quote(s)) + # Use also -k as new images contain at first DOS boot sector for UEFI + # then iso magic block + command = Builtins.sformat("%1 -kb -- '%2'", file, String.Quote(s)) - out = Convert.to_map(SCR.Execute(path(".target.bash_output"), command)) + out = SCR.Execute(path(".target.bash_output"), command) - stdout = Ops.get_string(out, "stdout", "") + stdout = out["stdout"] || "" - if Builtins.issubstring(stdout, "ISO 9660 CD-ROM filesystem") + if stdout.include? "ISO 9660 CD-ROM filesystem" Builtins.y2milestone("ISO 9660 image detected") else # continue/cancel popup, %1 is a file name continue with "q"... Checked in at Fri Feb 28 16:04:29 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro