Author: jsuchome Date: Fri Nov 2 13:42:52 2007 New Revision: 41736 URL: http://svn.opensuse.org/viewcvs/yast?rev=41736&view=rev Log: - correctly escape strings which should be written to config.xml (seen in #338090) - 2.13.20 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 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=41736&r1=41735&r2=41736&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Nov 2 13:42:52 2007 @@ -1 +1 @@ -2.13.19 +2.13.20 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=41736&r1=41735&r2=41736&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 Fri Nov 2 13:42:52 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 2 11:02:42 CET 2007 - jsuchome@suse.cz + +- correctly escape strings which should be written to config.xml + (seen in #338090) +- 2.13.20 + +------------------------------------------------------------------- Thu Nov 1 10:57:39 CET 2007 - jsuchome@suse.cz - save all types from the template to target config.xml 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=41736&r1=41735&r2=41736&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 Fri Nov 2 13:42:52 2007 @@ -247,9 +247,10 @@ children = children + "\n" + Map2XML (chmap, level + 1); }); else if (subkey == "__value") - value = sformat ("%1", val); + value = String::EscapeTags (sformat ("%1", val)); else if (is (val, string)) - ret = sformat ("%1 %2=\"%3\"", ret, subkey, val); + ret = sformat ("%1 %2=\"%3\"", + ret, subkey, String::EscapeTags (tostring (val))); }); if (non_unique_key[key]:false) return sformat ("%1/>", ret); @@ -275,6 +276,8 @@ return ret; map config = (map) SCR::Read (.kiwi, base_path + "/config.xml"); + if (config == nil) + return ret; map packages = config["packages"]:$[]; // rest parts of "packages" are saved in product-creator map ret["ignore"] = maplist (map p, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org