summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-10 16:08:35 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-10 16:08:35 -0400
commited39c3ef1c1820b4d48cecb776fcdb4a772f3ce1 (patch)
tree7488cc76eded9be4e1f4decdad3d90f86a8437cf
parent447126d638801a94bd5ed1a18cf5ae3c808a60d1 (diff)
downloadbcfg2-ed39c3ef1c1820b4d48cecb776fcdb4a772f3ce1.tar.gz
bcfg2-ed39c3ef1c1820b4d48cecb776fcdb4a772f3ce1.tar.bz2
bcfg2-ed39c3ef1c1820b4d48cecb776fcdb4a772f3ce1.zip
bcfg2-lint: fixed Validate for certain xinclude patterns
-rw-r--r--src/lib/Bcfg2/Server/Lint/Validate.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index b8bdb4755..e4c4bddd0 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -193,9 +193,8 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
elif self.HandlesFile(path):
rv.append(path)
groupdata = lxml.etree.parse(path)
- [included.add(el.get('href'))
- for el in
- groupdata.findall('./%sinclude' % XI_NAMESPACE)]
+ included.update(el for el in groupdata.findall('./%sinclude' %
+ XI_NAMESPACE))
included.discard(filename)
return rv