Author: jsuchome Date: Mon Oct 29 12:26:15 2007 New Revision: 41604 URL: http://svn.opensuse.org/viewcvs/yast?rev=41604&view=rev Log: - do not read the template name when going from main summary (#337444) - 2.15.10 Modified: branches/SuSE-Linux-10_3-Branch/product-creator/VERSION branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Linux-10_3-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/product-creator/VERSION?rev=41604&r1=41603&r2=41604&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/VERSION Mon Oct 29 12:26:15 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes?rev=41604&r1=41603&r2=41604&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes Mon Oct 29 12:26:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 26 12:52:54 CEST 2007 - jsuchome@suse.cz + +- do not read the template name when going from main summary (#337444) +- 2.15.10 + +------------------------------------------------------------------- Thu Oct 4 09:50:06 CEST 2007 - jsuchome@suse.cz - add a default user to the iso template (#328145) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp?rev=41604&r1=41603&r2=41604&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/kiwi_dialogs.ycp Mon Oct 29 12:26:15 2007 @@ -776,12 +776,15 @@ map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { - KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); + KiwiConfig = (map<string,any>) union ( + // "type" had different meaning in ProductCreator::Config... + remove (KiwiConfig, "type"), read_config); // for new configuration, do not read all from the template y2milestone ("product-creator based configuration..."); foreach (string key, ["addons", "packages", "sources"], { KiwiConfig[key] = ProductCreator::Config[key]:[]; }); + KiwiConfig["name"] = ProductCreator::Config["name"]:""; } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org