From f9b6982372833351ea430c10e286d7c7f050ddff Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 30 Jul 2012 15:57:50 -0400 Subject: fixed StructFile.Match() when it encounters comments --- src/lib/Bcfg2/Server/Plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2') diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index 51d1b1cdb..696dacc06 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -678,6 +678,8 @@ class StructFile(XMLFileBacked): def _include_element(self, item, metadata): """ determine if an XML element matches the metadata """ + if isinstance(item, lxml.etree._Comment): + return False negate = item.get('negate', 'false').lower() == 'true' if item.tag == 'Group': return ((negate and item.get('name') not in metadata.groups) or @@ -685,8 +687,6 @@ class StructFile(XMLFileBacked): elif item.tag == 'Client': return ((negate and item.get('name') != metadata.hostname) or (not negate and item.get('name') == metadata.hostname)) - elif isinstance(item, lxml.etree._Comment): - return False else: return True -- cgit v1.2.3-1-g7c22