Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-03-01 14:38:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2014-02-21 13:48:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-03-01 14:38:28.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Feb 28 13:24:48 UTC 2014 - [email protected] + +- Fix iso detection for DVD capable UEFI boot(BNC#852436) +- 3.1.6 + +------------------------------------------------------------------- +Wed Feb 26 14:46:40 UTC 2014 - [email protected] + +- Always prefer DVD medium to download (not only during update) + (bnc#865819) +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.4.tar.bz2 New: ---- yast2-packager-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.1az6Sl/_old 2014-03-01 14:38:29.000000000 +0100 +++ /var/tmp/diff_new_pack.1az6Sl/_new 2014-03-01 14:38:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.4 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.4.tar.bz2 -> yast2-packager-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.4/package/yast2-packager.changes new/yast2-packager-3.1.6/package/yast2-packager.changes --- old/yast2-packager-3.1.4/package/yast2-packager.changes 2014-02-19 14:21:58.000000000 +0100 +++ new/yast2-packager-3.1.6/package/yast2-packager.changes 2014-02-28 14:44:49.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Feb 28 13:24:48 UTC 2014 - [email protected] + +- Fix iso detection for DVD capable UEFI boot(BNC#852436) +- 3.1.6 + +------------------------------------------------------------------- +Wed Feb 26 14:46:40 UTC 2014 - [email protected] + +- Always prefer DVD medium to download (not only during update) + (bnc#865819) +- 3.1.5 + +------------------------------------------------------------------- Mon Feb 17 16:30:26 CET 2014 - [email protected] - Package tightvnc is no more required while installing over VNC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.4/package/yast2-packager.spec new/yast2-packager-3.1.6/package/yast2-packager.spec --- old/yast2-packager-3.1.4/package/yast2-packager.spec 2014-02-19 14:21:58.000000000 +0100 +++ new/yast2-packager-3.1.6/package/yast2-packager.spec 2014-02-28 14:44:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.4 +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.4/src/clients/inst_kickoff.rb new/yast2-packager-3.1.6/src/clients/inst_kickoff.rb --- old/yast2-packager-3.1.4/src/clients/inst_kickoff.rb 2014-02-19 14:21:59.000000000 +0100 +++ new/yast2-packager-3.1.6/src/clients/inst_kickoff.rb 2014-02-28 14:44:50.000000000 +0100 @@ -60,6 +60,10 @@ end end + # prefer CD/DVD media to download during installation/update + Builtins.y2milestone("Prefer CD/DVD media to download") + Pkg.SetZConfig({ "download_media_prefer_download" => false }) + # installation, for instance... if !Mode.update # make some directories @@ -162,10 +166,6 @@ WFM.CallFunction("inst_bootloader", WFM.Args) # } else - # prefer CD/DVD media to download during installation/update - Builtins.y2milestone("Update mode - prefer CD/DVD media to download") - Pkg.SetZConfig({ "download_media_prefer_download" => false }) - if Stage.normal Yast.import "Kernel" @kernel = Kernel.ComputePackage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.4/src/modules/SourceDialogs.rb new/yast2-packager-3.1.6/src/modules/SourceDialogs.rb --- old/yast2-packager-3.1.4/src/modules/SourceDialogs.rb 2014-02-19 14:21:59.000000000 +0100 +++ new/yast2-packager-3.1.6/src/modules/SourceDialogs.rb 2014-02-28 14:44:50.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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
