diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-07-24 11:32:56 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-20 17:30:39 -0400 |
| commit | 4e75773f31bd5dd1cbad30296b2a32c38e552ead (patch) | |
| tree | 5ebacb2ae0a3d09ea0628edf49015c495c81b3fb /src/lib/Server/Lint/Comments.py | |
| parent | 6cc1ede5cba4a27871ece2cbdab4ebc93c00fb4c (diff) | |
| download | bcfg2-4e75773f31bd5dd1cbad30296b2a32c38e552ead.tar.gz bcfg2-4e75773f31bd5dd1cbad30296b2a32c38e552ead.tar.bz2 bcfg2-4e75773f31bd5dd1cbad30296b2a32c38e552ead.zip | |
allow xinclude files to be missing if xi:fallback is provided
Conflicts:
src/lib/Server/Lint/Comments.py
src/lib/Server/Plugin.py
Diffstat (limited to 'src/lib/Server/Lint/Comments.py')
| -rw-r--r-- | src/lib/Server/Lint/Comments.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Lint/Comments.py b/src/lib/Server/Lint/Comments.py index 19fae1b08..10eb8da51 100644 --- a/src/lib/Server/Lint/Comments.py +++ b/src/lib/Server/Lint/Comments.py @@ -1,6 +1,7 @@ -import os.path +import os import lxml.etree import Bcfg2.Server.Lint +from Bcfg2.Server import XI, XI_NAMESPACE class Comments(Bcfg2.Server.Lint.ServerPlugin): """ check files for various required headers """ @@ -177,7 +178,7 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): path = os.path.join(self.metadata.data, mfile) if path in self.files: xdata = lxml.etree.parse(path) - for el in xdata.findall('./{http://www.w3.org/2001/XInclude}include'): + for el in xdata.findall('./%sinclude' % XI_NAMESPACE): if not self.has_all_xincludes(el.get('href')): self.LintError("broken-xinclude-chain", "Broken XInclude chain: could not include %s" % path) |