Author: jsuchome Date: Mon Oct 15 14:02:42 2007 New Revision: 41425 URL: http://svn.opensuse.org/viewcvs/yast?rev=41425&view=rev Log: - fix initializing when going Back (#332581) - 2.13.14 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_dialogs.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=41425&r1=41424&r2=41425&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Mon Oct 15 14:02:42 2007 @@ -1 +1 @@ -2.13.13 +2.13.14 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=41425&r1=41424&r2=41425&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 Mon Oct 15 14:02:42 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 15 13:27:11 CEST 2007 - jsuchome@suse.cz + +- fix initializing when going Back (#332581) +- 2.13.14 + +------------------------------------------------------------------- Fri Oct 12 11:15:01 CEST 2007 - jsuchome@suse.cz - fix adding CD/DVD/SLP repositories (#333106) 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=41425&r1=41424&r2=41425&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 Mon Oct 15 14:02:42 2007 @@ -622,7 +622,6 @@ update_output (); integer status = (integer) SCR::Read (.background.status); -y2internal ("status: %1", status); if (status != 0) { UI::ReplaceWidget (`id (`rp), `HBox ( Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp?rev=41425&r1=41424&r2=41425&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Mon Oct 15 14:02:42 2007 @@ -810,7 +810,8 @@ y2milestone ("imported configuration..."); // ignore options already set earlier... foreach (string key, any val, read_config, { - if (!contains (["name", "iso-directory", "sources", "version"],key)) + if (!contains (["name", "iso-directory", "sources", "version", + "type"],key)) { KiwiConfig[key] = val; } @@ -1521,6 +1522,17 @@ }); default_type_items = type_items; } + else if (supported_images == "template" && !new_configuration) + { + list type_its = []; + //solve `back here (=no import) + foreach (string type, map data, Config["type"]:$[], { + type_its = add (type_its, + `item (`id (type), task2label[type]:type)); + }); + if (type_its != []) + type_items = type_its; + } if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task)) type_items = add (type_items, `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task, true)); @@ -1584,7 +1596,7 @@ supported_images == "template") { type_its = add (type_its, - `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task)); + `item (`id (type), task2label[type]:type)); present_types = union (present_types, [type]); } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org