Author: jsuchome Date: Wed Dec 5 12:54:15 2007 New Revision: 42705 URL: http://svn.opensuse.org/viewcvs/yast?rev=42705&view=rev Log: - fixed generating configuration path name (#346152) - 2.13.25 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... ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed Dec 5 12:54:15 2007 @@ -1 +1 @@ -2.13.24 +2.13.25 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... ============================================================================== --- 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 Wed Dec 5 12:54:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 5 12:33:16 CET 2007 - jsuchome@suse.cz + +- fixed generating configuration path name (#346152) +- 2.13.25 + +------------------------------------------------------------------- Fri Nov 16 12:59:17 CET 2007 - jsuchome@suse.cz - do not mention CD source in help texts (#341615) 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... ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Wed Dec 5 12:54:15 2007 @@ -741,7 +741,7 @@ if (!FileUtils::Exists (images_dir)) SCR::Execute (.target.mkdir, images_dir); SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", config_dir, images_dir)); - return (images_dir + KiwiConfig["name"]:""); + return (images_dir + "/" + KiwiConfig["name"]:""); } /** 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... ============================================================================== --- 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 Wed Dec 5 12:54:15 2007 @@ -798,9 +798,10 @@ map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { - KiwiConfig = (map<string,any>) union ( - // "type" had different meaning in ProductCreator::Config... - remove (KiwiConfig, "type"), read_config); + // "type" had different meaning in ProductCreator::Config... + if (haskey (KiwiConfig, "type")) + KiwiConfig = remove (KiwiConfig, "type"); + KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); // for new configuration, do not read all from the template y2milestone ("product-creator based configuration..."); foreach (string key, ["addons", "packages", "sources"], { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org