summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-14 16:44:29 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-14 16:44:29 -0500
commit5c3630c40114e7e4ad13ef141d26b32d7ccffdd6 (patch)
tree2f182a71a618a4627c7d74c715a2a66514518aed /src
parent6ce9af36f6f0e7796d986b29ce3f4d8a52c55d2b (diff)
downloadbcfg2-5c3630c40114e7e4ad13ef141d26b32d7ccffdd6.tar.gz
bcfg2-5c3630c40114e7e4ad13ef141d26b32d7ccffdd6.tar.bz2
bcfg2-5c3630c40114e7e4ad13ef141d26b32d7ccffdd6.zip
bcfg2-lint: fixed requiring a specific format of text content
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Lint/RequiredAttrs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index 9ed8be2e4..61b737a82 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -231,6 +231,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
required_attrs[entry.get('scope')] = is_username
if '__text__' in required_attrs:
+ fmt = required_attrs['__text__']
del required_attrs['__text__']
if (not entry.text and
not entry.get('empty', 'false').lower() == 'true'):
@@ -238,7 +239,6 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
"Text missing for %s %s in %s: %s" %
(tag, name, filename,
self.RenderXML(entry)))
- fmt = required_attrs['__text__']
if fmt is not None and not fmt(entry.text):
self.LintError(
"required-attr-format",