Author: lslezak Date: Fri Mar 30 16:23:42 2012 New Revision: 67837 URL: http://svn.opensuse.org/viewcvs/yast?rev=67837&view=rev Log: - fixed displaying UTF-8 values (bnc#728588), fixed handling values containing single quotes - 2.22.0 Modified: trunk/sysconfig/VERSION trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/complex.ycp Modified: trunk/sysconfig/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/VERSION?rev=67837&r1=67836&r2=67837&view=diff ============================================================================== --- trunk/sysconfig/VERSION (original) +++ trunk/sysconfig/VERSION Fri Mar 30 16:23:42 2012 @@ -1 +1 @@ -2.21.2 +2.22.0 Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfig.changes?rev=67837&r1=67836&r2=67837&view=diff ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Fri Mar 30 16:23:42 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 30 14:18:00 UTC 2012 - lslezak@suse.cz + +- fixed displaying UTF-8 values (bnc#728588), fixed handling values + containing single quotes +- 2.22.0 + +------------------------------------------------------------------- Thu Mar 29 16:09:54 CEST 2012 - jsuchome@suse.cz - merge proofread texts Modified: trunk/sysconfig/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/complex.ycp?rev=67837&r1=67836&r2=67837&view=diff ============================================================================== --- trunk/sysconfig/src/complex.ycp (original) +++ trunk/sysconfig/src/complex.ycp Fri Mar 30 16:23:42 2012 @@ -395,37 +395,9 @@ return nil; } - string ret = ""; - integer index = 0; - boolean backslash = false; + string ret = regexpsub(input, "(.*)\\([^$].*)", "\\1\\2"); - while (index < size(input)) - { - string ch = substring(input, index, 1); - string ch_1 = substring(input, index + 1, 1); - - if (backslash == false) - { - // don't remove backslash before \$ (#34809) - if (ch == "\\" && ch_1 != nil && ch_1 != "$") - { - backslash = true; - } - else - { - ret = ret + ch; - } - } - else - { - ret = ret + ch; - backslash = false; - } - - index = index + 1; - } - - return ret; + return (ret == nil) ? input : ret; } /** @@ -444,7 +416,7 @@ value = (haskey(description, "Default")) ? description["Default"]:"" : ""; } - if (description["actions","SingleQt"]:"" == "") + if (description["actions","SingleQt"]:"" == "1") { new_value = backslash_remove(new_value); value = backslash_remove(value); @@ -608,7 +580,7 @@ map d = Sysconfig::get_description(selected_variable); // check whether single quotes are used in the configuration file - if (d["actions", "SingleQt"]:"" == "") + if (d["actions", "SingleQt"]:"" == "1") { new_value = backslash_add(new_value); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org