Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Thu Jun 9 15:02:45 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-06-07 10:55:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-06-09 14:54:56.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 9 12:54:29 UTC 2011 - [email protected] + +- fix product building, command line parameters were not parsed before + executing + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fix-product-build.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.WHf3fm/_old 2011-06-09 15:02:10.000000000 +0200 +++ /var/tmp/diff_new_pack.WHf3fm/_new 2011-06-09 15:02:10.000000000 +0200 @@ -70,13 +70,15 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.91 -Release: 5 +Release: 7 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 Source1: %{name}-rpmlintrc Source2: %{name}-docu.tar.bz2 Source3: %{name}-repo.tar.bz2 +# temporary, submitted to git master +Patch: fix-product-build.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: jing Recommends: zypper @@ -299,6 +301,7 @@ %prep %setup -n %name -a2 -a3 +%patch -p1 %build # empty because of rpmlint warning rpm-buildroot-usage @@ -509,5 +512,4 @@ %endif - %changelog ++++++ fix-product-build.diff ++++++ commit 72eeaed91809ba42dbf108fb4fed0a78016f067e Author: Adrian Schröter <[email protected]> Date: Thu Jun 9 14:49:10 2011 +0200 - fix handling of parameters for product image building diff --git a/kiwi.pl b/kiwi.pl index 80b3a10..6cbc81b 100755 --- a/kiwi.pl +++ b/kiwi.pl @@ -1102,6 +1102,20 @@ sub init { $cmdL -> setOperationMode ("listXMLInfo",$ListXMLInfo); } #======================================== + # store configuration options important for non-root tasks + #---------------------------------------- + if (defined $LogFile) { + $cmdL -> setLogFile ($LogFile); + } + if (($InitCache) && ($LogFile)) { + $kiwi -> warning ("Logfile set to terminal in init-cache mode"); + $cmdL -> setLogFile ("terminal"); + $kiwi -> done (); + } + if (defined $RootTree) { + $cmdL -> setRootTargetDir($RootTree) + } + #======================================== # store original value of Profiles #---------------------------------------- $cmdL -> setBuildProfiles (\@Profiles); @@ -1194,14 +1208,6 @@ sub init { $kiwi -> failed (); kiwiExit (1); } - if (defined $LogFile) { - $cmdL -> setLogFile ($LogFile); - } - if (($InitCache) && ($LogFile)) { - $kiwi -> warning ("Logfile set to terminal in init-cache mode"); - $cmdL -> setLogFile ("terminal"); - $kiwi -> done (); - } if (($targetDevice) && (! -b $targetDevice)) { $kiwi -> error ("Target device $targetDevice doesn't exist"); $kiwi -> failed (); @@ -1212,9 +1218,6 @@ sub init { $kiwi -> failed (); kiwiExit (1); } - if (defined $RootTree) { - $cmdL -> setRootTargetDir($RootTree) - } if (defined $LogPort) { $kiwi -> info ("Setting log server port to: $LogPort"); $global -> setGlobals ("LogServerPort", $LogPort); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
