Author: jsuchome
Date: Tue Nov 6 12:27:30 2007
New Revision: 41815
URL: http://svn.opensuse.org/viewcvs/yast?rev=41815&view=rev
Log:
- correctly escape strings which should be written to config.xml
(seen in #338090)
Modified:
branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes
branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp
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=41815&r1=41814&r2=41815&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 Tue Nov 6 12:27:30 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Nov 6 12:25:59 CET 2007 - jsuchome@suse.cz
+
+- correctly escape strings which should be written to config.xml
+ (seen in #338090)
+
+-------------------------------------------------------------------
Fri Oct 26 12:52:54 CEST 2007 - jsuchome@suse.cz
- do not read the template name when going from main summary (#337444)
Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp?rev=41815&r1=41814&r2=41815&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp (original)
+++ branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp Tue Nov 6 12:27:30 2007
@@ -177,9 +177,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);
@@ -205,6 +206,8 @@
return ret;
map config = (map) SCR::Read (.kiwi, base_path + "/config.xml");
+ if (config == nil)
+ return ret;
map