Mailinglist Archive: yast-commit (864 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Tue Nov  6 12:26:42 2007
New Revision: 41814

URL: http://svn.opensuse.org/viewcvs/yast?rev=41814&view=rev
Log:
- correctly escape strings which should be written to config.xml
  (seen in #338090) 


Modified:
    trunk/product-creator/package/yast2-product-creator.changes
    trunk/product-creator/src/Kiwi.ycp

Modified: trunk/product-creator/package/yast2-product-creator.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=41814&r1=41813&r2=41814&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Tue Nov  6 
12:26:42 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Nov  2 11:13:58 CET 2007 - jsuchome@xxxxxxx
+
+- correctly escape strings which should be written to config.xml
+  (seen in #338090) 
+
+-------------------------------------------------------------------
 Thu Nov  1 11:01:12 CET 2007 - jsuchome@xxxxxxx
 
 - fixed checking if repository has 'plaindir' format (#338115)

Modified: trunk/product-creator/src/Kiwi.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=41814&r1=41813&r2=41814&view=diff
==============================================================================
--- trunk/product-creator/src/Kiwi.ycp (original)
+++ trunk/product-creator/src/Kiwi.ycp Tue Nov  6 12:26:42 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<string,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@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx