From 1109474bfc7e1fbbd0ba298ef9d44810bb3aea7d Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 24 Jul 2012 15:14:51 -0400 Subject: GroupPatterns improvements Use re.search() instead of re.match() for more flexible regex Better stringification of pattern objects --- src/lib/Bcfg2/Server/Plugins/GroupPatterns.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/GroupPatterns.py') diff --git a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py index 1ee312de8..837f47279 100644 --- a/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py +++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py @@ -61,7 +61,7 @@ class PatternMap(object): return self.groups def process_re(self, name): - match = self.re.match(name) + match = self.re.search(name) if not match: return None ret = list() @@ -73,6 +73,10 @@ class PatternMap(object): ret.append(newg) return ret + def __str__(self): + return "%s: %s %s" % (self.__class__.__name__, self.pattern, + self.groups) + class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked): __identifier__ = None @@ -116,7 +120,6 @@ class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked): class GroupPatterns(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Connector): name = "GroupPatterns" - experimental = True def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) -- cgit v1.2.3-1-g7c22