Author: locilka Date: Tue Sep 13 10:45:49 2011 New Revision: 65674 URL: http://svn.opensuse.org/viewcvs/yast?rev=65674&view=rev Log: - Fixed SuSEfirewall2 SCR agent to understand single-quoted and double-quoted, single and multi-line variables and also single-line variables without any quotes (bnc#716013). Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr?rev=65674&r1=65673&r2=65674&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr Tue Sep 13 10:45:49 2011 @@ -32,20 +32,19 @@ "options" : [ "line_can_continue", "global_values", "comments_last", "flat", ], "comments": [ "^[ \t]*#.*$", "#.*", "^[ \t]*$", ], "params" : [ + // single quotes $[ - // with quotes - "match" : [ "^[ \t]*([_a-zA-Z0-9]+)[ \t]*=[ \t]*\"(.*)\"[ \t]*$", "%s=\"%s\"" ], - // without quotes - "match" : [ "^[ \t]*([_a-zA-Z0-9]+)[ \t]*=[ \t]*([^\"]*)[ \t]*$", "%s=\"%s\"" ], + "match" : [ "^[ \t]*([a-zA-Z0-9_]+)=\"([^\"]*)\"", "%s=\"%s\"" ], + "multiline" : [ "^[ \t]*([^=]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"" ], ], + // double (common) quotes $[ - "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ], - "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"", ], + "match" : [ "^[ \t]*([a-zA-Z0-9_]+)='([^']*)'", "%s='%s'" ], + "multiline" : [ "^[ \t]*([^=]+)[ \t]*=[ \t]*'([^']*)", "([^']*)'" ], ], - // also single quotes, bnc#327565 + // without any quotes $[ - "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)'", "%s=\"%s\"" ], - "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)", "([^\']*)'", ], + "match" : [ "^[ \t]*([a-zA-Z0-9_]+)=([^ \t\"']*)[ \t]*$", "%s=\"%s\"" ], ], ], ] Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes?rev=65674&r1=65673&r2=65674&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Tue Sep 13 10:45:49 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 13 10:39:42 CEST 2011 - locilka@suse.cz + +- Fixed SuSEfirewall2 SCR agent to understand single-quoted and + double-quoted, single and multi-line variables and also + single-line variables without any quotes (bnc#716013). + +------------------------------------------------------------------- Fri Aug 26 13:26:32 CEST 2011 - locilka@suse.cz - Fixed handling of FW_SERVICES_ACCEPT_* in SuSEFirewall modules to -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org