Author: jsuchome Date: Tue Aug 4 09:21:57 2009 New Revision: 58267 URL: http://svn.opensuse.org/viewcvs/yast?rev=58267&view=rev Log: - give kiwi more time to finish (bnc#525986) - show the warning when package management is locked (bnc#526338) - show error if removing old chroot failed (bnc#525993) - delete wrong examlple from the help text (bnc#527150) - probe repositories of NONE type (bnc#527198) - 2.17.26 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/VERSION?rev=58267&r1=58266&r2=58267&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Tue Aug 4 09:21:57 2009 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes?rev=58267&r1=58266&r2=58267&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Tue Aug 4 09:21:57 2009 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Aug 3 15:32:25 CEST 2009 - jsuchome@suse.cz + +- give kiwi more time to finish (bnc#525986) +- show the warning when package management is locked (bnc#526338) +- show error if removing old chroot failed (bnc#525993) +- delete wrong examlple from the help text (bnc#527150) +- probe repositories of NONE type (bnc#527198) +- 2.17.26 + +------------------------------------------------------------------- Wed Jul 15 12:08:31 CEST 2009 - jsuchome@suse.cz - do not re-crypt user password already crypted (bnc#521887) Modified: branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp?rev=58267&r1=58266&r2=58267&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp Tue Aug 4 09:21:57 2009 @@ -131,6 +131,8 @@ string url = data["url"]:""; if (url == source || url == adapt_source_path (source)) { + if (data["type"]:"" == "NONE") + data["type"] = Pkg::RepositoryProbe (url, ""); if (data["type"]:"" == "Plaindir") type = "rpm-dir"; if (data["type"]:"" == "YUM") @@ -391,6 +393,19 @@ return substring (full_path, 0, findlastof (full_path, "/")); } + // wait until process is really done or kill -9 it after minute + void give_kiwi_time_to_finish (integer pid) { + integer count = 0; + while (SCR::Read(.process.running, pid) == true) + { + sleep(100); + count = count + 1; + if (count > 600) break; + } + if (SCR::Read(.process.running, pid) == true) SCR::Execute (.process.kill, pid); + } + + /** * run kiwi to finally create the selected image * @param out_dir output directory for the result @@ -410,7 +425,13 @@ if (FileUtils::Exists (chroot_dir)) { y2milestone ("%1 directory is present, removing...", chroot_dir); - SCR::Execute (.target.bash, sformat ("rm -rf %1", chroot_dir)); + map out = (map) SCR::Execute (.target.bash_output, sformat ("rm -rf %1", chroot_dir)); + if (out["exit"]:0 != 0) + { + y2warning ("cmd output: %1", out); + Report::Error (_("Removing old chroot directory failed.") + "\n\n" + out["stderr"]:""); + return false; + } } // create path to chroot_dir if it does not exist (#406731) FileUtils::CheckAndCreatePath (path_to_dir (chroot_dir)); @@ -523,13 +544,13 @@ if (ret == `cancel) { SCR::Execute (.process.kill, id, 15); - sleep (100); - SCR::Execute (.process.kill, id); + give_kiwi_time_to_finish (id); } sleep (100); } while (ret == nil); - SCR::Execute (.process.kill, id); + give_kiwi_time_to_finish (id); + UI::CloseDialog (); return ret == `ok; } Modified: branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp?rev=58267&r1=58266&r2=58267&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Tue Aug 4 09:21:57 2009 @@ -18,6 +18,7 @@ import "Label"; import "Message"; import "Package"; + import "PackageLock"; import "PackageSystem"; import "Popup"; import "ProductCreator"; @@ -1797,7 +1798,7 @@ "store" : StorePreferences, "handle" : HandlePreferences, // help text for keytable - "help" : _("<p><b>Keyboard layout</b> specifies the name of the console keymap to use. The value (e.g. <tt>us</tt>) corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"), + "help" : _("<p><b>Keyboard layout</b> specifies the name of the console keymap to use. The value corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"), ], "timezone" : $[ "widget" : `textentry, @@ -2360,6 +2361,8 @@ } else if (ret == `next) { + y2internal ("package lock check returned %1", PackageLock::Check ()); + name = (string) UI::QueryWidget (`id (`config), `Value); if (name == "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org