Author: jsuchome Date: Tue Jun 5 16:02:39 2007 New Revision: 38289 URL: http://svn.opensuse.org/viewcvs/yast?rev=38289&view=rev Log: - kiwi UI: create output directly in output directory to prevent problems with kernel symlink (#279981) - 2.13.5 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION?rev=38289&r1=38288&r2=38289&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Tue Jun 5 16:02:39 2007 @@ -1 +1 @@ -2.13.4 +2.13.5 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=38289&r1=38288&r2=38289&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue Jun 5 16:02:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 5 15:35:29 CEST 2007 - jsuchome@suse.cz + +- kiwi UI: create output directly in output directory to prevent + problems with kernel symlink (#279981) +- 2.13.5 + +------------------------------------------------------------------- Thu May 31 14:33:51 CEST 2007 - lslezak@suse.cz - if the product is not bootable do not create /boot directory, Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp?rev=38289&r1=38288&r2=38289&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Tue Jun 5 16:02:39 2007 @@ -386,7 +386,7 @@ } // run kiwi to finally create the live iso image - global boolean PrepareAndCreate () { + global boolean PrepareAndCreate (string out_dir) { if (config_dir == "" || !FileUtils::Exists (config_dir)) return false; @@ -462,9 +462,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("kiwi --create %1/myphysical -d %1/output --logfile terminal", - tmp_dir); - SCR::Execute (.target.mkdir, tmp_dir + "/output"); + cmd = sformat ("kiwi --create %1/myphysical -d %2 --logfile terminal", + tmp_dir, out_dir); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image...")))); @@ -505,22 +504,5 @@ return (images_dir + get_config_dir (KiwiConfig["name"]:"", kiwi_task)); } - /** - * move the final image(s) created by kiwi to user defined directory - */ - global string MoveOutput (string out_dir) { - string ret = tmp_dir + "/output"; // the actual output directory - if (out_dir == "") return ret; - if (FileUtils::CheckAndCreatePath (out_dir)) - { - y2milestone ("moving %1/* to %2/", ret, out_dir); - SCR::Execute (.target.bash, sformat ("mv %1/* %2/", ret, out_dir)); - ret = out_dir; - } - return ret; - } - } - - Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp?rev=38289&r1=38288&r2=38289&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Tue Jun 5 16:02:39 2007 @@ -661,13 +661,13 @@ { if (Kiwi::WriteConfigXML (KiwiConfig, kiwi_task)) { - if (Kiwi::PrepareAndCreate ()) + string out_dir = KiwiConfig["iso-directory"]:""; + if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir)) { - string dir = Kiwi::MoveOutput (KiwiConfig["iso-directory"]:""); if (kiwi_task == "usb" && false) { // additional question (yes/no) - if (Popup::YesNo (sformat (success[kiwi_task]:"", dir) + _(" + if (Popup::YesNo (sformat (success[kiwi_task]:"", out_dir) + _(" Save the image to the stick now?"))) { NotImplementedHandler ("", $[ "ID" : ""]); @@ -675,7 +675,7 @@ } else { - Popup::Message (sformat (success[kiwi_task]:"", dir)); + Popup::Message (sformat (success[kiwi_task]:"", out_dir)); } ret = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org