Author: mfilka Date: Thu May 10 12:18:08 2012 New Revision: 68134 URL: http://svn.opensuse.org/viewcvs/yast?rev=68134&view=rev Log: removed ShellSafeWrite function as ag_ini supports escaping already Modified: trunk/yast2/VERSION trunk/yast2/library/network/agents/network.scr.in trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=68134&r1=68133&r2=68134&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu May 10 12:18:08 2012 @@ -1 +1 @@ -2.22.6 +2.23.0 Modified: trunk/yast2/library/network/agents/network.scr.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/agents/network.scr.in?rev=68134&r1=68133&r2=68134&view=diff ============================================================================== --- trunk/yast2/library/network/agents/network.scr.in (original) +++ trunk/yast2/library/network/agents/network.scr.in Thu May 10 12:18:08 2012 @@ -24,17 +24,12 @@ `IniAgent( [ "@IFCFG_DIR@/ifcfg-*" ], $[ /* values at the top level, allow comments after value */ - "options" : [ "global_values", "comments_last" ], + "options" : [ "global_values", "comments_last", "shell_quoted_value" ], /* empty lines, comments after value and whole-line comments */ "comments" : [ "^[ \t]*$", "[ \t]*#.*$", "^[ \t]*#.*$" ], /* matching rules */ "params" : [ - /* VAR1="val1 'bal x" */ - $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=\"([^\"`\\$]*)\"", "%s='%s'" ] ], - /* VAR1='val1 xxx" xx' */ - $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)='([^']*)'", "%s='%s'" ] ], - /* VAR1=val1 */ - $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=([^ \t\"$`'\\#]*)", "%s='%s'" ] ], + $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=[ \t]*(.*)[ \t]*", "%s=%s" ] ], ], /* matching rules */ "rewrite" : [ Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=68134&r1=68133&r2=68134&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Thu May 10 12:18:08 2012 @@ -670,41 +670,6 @@ return devices; } -/** - * For the NAME field, filter out characters that will case problems - * for the shell or the ini agent. (#72164) - * It should be done in more places but this field is most susceptible. - * @param s a string - * @return s with some characters removed, esp. the single quote - */ -string ShellSafe (string s) { - s = filterchars (s, String::CGraph () + " "); - return deletechars (s, "'"); -} - -/** - * SCR::Write (p, ShellSafe (s)) and if s had to be changed, - * log the _path_ (not the value, for privacy). - * @see ShellSafe - * @param p SCR path - * @param s value - * @return success - */ -boolean ShellSafeWrite (path p, string s) { - string safe_s = ShellSafe (s); - if (safe_s != s) - { - y2milestone ("Changed: %1", p); - } - return SCR::Write (p, safe_s); -} - -/** - * Write devices to files - * @param devregex regular expression for the device type - * @return true if success - * @example NetworkDevice::Write("eth|tr"); - */ global define boolean Write(string devregex) { y2milestone("Writing configuration"); y2debug("Devices=%1", Devices); @@ -799,7 +764,7 @@ maplist(string ak, string av, amap, { string akk = ak + "_" + anum; - ShellSafeWrite (topath (p + akk), av); + SCR::Write (topath (p + akk), av); // seen_label = seen_label || ak == "LABEL"; }); /* @@ -812,7 +777,7 @@ } /* Write regular keys */ else - ShellSafeWrite (topath (p + k), devmap[k]:""); + SCR::Write (topath (p + k), devmap[k]:""); }); /* update libhd unique number * / Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.out?rev=68134&r1=68133&r2=68134&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.out (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.out Thu May 10 12:18:08 2012 @@ -2,11 +2,11 @@ Dir .network.section: ["eth4"] Dir .network.value."eth4": ["BOOTPROTO", "NAME"] Read .network.value."eth4".BOOTPROTO "dhcp" -Read .network.value."eth4".NAME "single quotes aren't good" +Read .network.value."eth4".NAME "we like 'singles'" Return true Dump NetworkInterfaces::Write Write .network.value."eth4".BOOTPROTO "dhcp" true -Write .network.value."eth4".NAME "single quotes arent good" true +Write .network.value."eth4".NAME "we like 'singles'" true Write .network.value."eth4".STARTMODE "" true Write .network nil true Return true Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp?rev=68134&r1=68133&r2=68134&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp Thu May 10 12:18:08 2012 @@ -9,7 +9,7 @@ "eth4" : nil, ], "value" : $[ - "eth4" : $["BOOTPROTO":"dhcp", "NAME": "single quotes aren't good"], + "eth4" : $["BOOTPROTO":"dhcp", "NAME": "we like 'singles'"], ] ], "probe" : $[ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=68134&r1=68133&r2=68134&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu May 10 12:18:08 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 10 07:17:40 UTC 2012 - mfilka@suse.com + +- removed ShellSafeWrite as it is not needed anymore with new ag_ini - bnc#750325 +- 2.23.0 + +------------------------------------------------------------------- Thu Mar 29 14:02:47 CEST 2012 - jsuchome@suse.cz - merged proofed texts Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=68134&r1=68133&r2=68134&view=diff ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Thu May 10 12:18:08 2012 @@ -13,7 +13,8 @@ PreReq: %fillup_prereq # ag_ini section_private -Requires: yast2-core >= 2.22.1 +# ag_ini with (un)quoting support +Requires: yast2-core >= 2.23.0 # Mod_UI # new UI::OpenContextMenu Requires: yast2-ycp-ui-bindings >= 2.18.4 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org