From 5c3d87bcd4f0f41b76076f5f30df328fcaa79e87 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 16 Jul 2009 03:22:13 +0000 Subject: GroupPatterns: short-circuit range matching git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5337 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/GroupPatterns.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugins/GroupPatterns.py b/src/lib/Server/Plugins/GroupPatterns.py index 6ff0c7162..de25d0143 100644 --- a/src/lib/Server/Plugins/GroupPatterns.py +++ b/src/lib/Server/Plugins/GroupPatterns.py @@ -14,8 +14,12 @@ class PackedDigitRange(object): def includes(self, other): iother = int(other) - return iother in self.sparse or True in \ - [iother in range(rng[0], rng[1]+1) for rng in self.ranges] + if iother in self.sparse: + return True + for (start, end) in self.ranges: + if iother in xrange(start, end+1): + return True + return False class PatternMap(object): range_finder = '\\[\\[[\d\-,]+\\]\\]' -- cgit v1.2.3-1-g7c22