From 3c38f4fab6a0128f8a0da5155f8bcb382fbd5b8a Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 29 Aug 2013 09:01:25 -0400 Subject: Revert "Rules: fixed HandlesEntry for XMLSrc replacement" This reverts commit 542ededa8297b1889542d97b9bdfb8345dd7550c. Committed to wrong branch. --- src/lib/Bcfg2/Server/Plugins/Rules.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Bcfg2/Server/Plugins/Rules.py b/src/lib/Bcfg2/Server/Plugins/Rules.py index 42d66e9d8..21862c5db 100644 --- a/src/lib/Bcfg2/Server/Plugins/Rules.py +++ b/src/lib/Bcfg2/Server/Plugins/Rules.py @@ -13,10 +13,9 @@ class Rules(Bcfg2.Server.Plugin.PrioDir): self._regex_cache = dict() def HandlesEntry(self, entry, metadata): - for src in self.entries.values(): - for candidate in src.XMLMatch(metadata).xpath("//%s" % entry.tag): - if self._matches(entry, metadata, candidate): - return True + if entry.tag in self.Entries: + return self._matches(entry, metadata, + self.Entries[entry.tag].keys()) return False def BindEntry(self, entry, metadata): -- cgit v1.2.3-1-g7c22