diff options
| -rw-r--r-- | examples/bcfg2-lint.conf | 5 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/Comments.py | 6 | ||||
| -rw-r--r-- | tools/manpagegen/bcfg2-lint.conf.5.ronn | 10 |
3 files changed, 11 insertions, 10 deletions
diff --git a/examples/bcfg2-lint.conf b/examples/bcfg2-lint.conf index 6ca3fb61f..0fe99f967 100644 --- a/examples/bcfg2-lint.conf +++ b/examples/bcfg2-lint.conf @@ -14,9 +14,10 @@ required_attrs = owner,group,perms,paranoid [Comments] global_keywords = Id -sgenshi_comments = Properties,Probes,Description +genshibundler_comments = Properties,Probes,Description properties_comments = Template,Format -tgenshi_comments = Maintainer,Properties,Probes,Description +genshi_comments = Maintainer,Properties,Probes,Description +cheetah_comments = Maintainer,Properties,Probes,Description cfg_comments = cfg_keywords = probe_comments = Maintainer,Purpose,Groups,Other Output diff --git a/src/lib/Bcfg2/Server/Lint/Comments.py b/src/lib/Bcfg2/Server/Lint/Comments.py index bb1217f92..ecea1ad1b 100644 --- a/src/lib/Bcfg2/Server/Lint/Comments.py +++ b/src/lib/Bcfg2/Server/Lint/Comments.py @@ -73,7 +73,7 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): except (lxml.etree.XMLSyntaxError, AttributeError): xdata = \ lxml.etree.parse(bundle.template.filepath).getroot() - rtype = "sgenshi" + rtype = "genshibundler" self.check_xml(bundle.name, xdata, rtype) @@ -103,11 +103,11 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): for entry in entryset.entries.values(): rtype = None if isinstance(entry, CfgGenshiGenerator): - rtype = "tgenshi" + rtype = "genshi" elif isinstance(entry, CfgPlaintextGenerator): rtype = "cfg" elif isinstance(entry, CfgCheetahGenerator): - rtype = "tcheetah" + rtype = "cheetah" elif isinstance(entry, CfgInfoXML): self.check_xml(entry.infoxml.name, entry.infoxml.pnode.data, diff --git a/tools/manpagegen/bcfg2-lint.conf.5.ronn b/tools/manpagegen/bcfg2-lint.conf.5.ronn index aed3eaaa8..60266d9b2 100644 --- a/tools/manpagegen/bcfg2-lint.conf.5.ronn +++ b/tools/manpagegen/bcfg2-lint.conf.5.ronn @@ -57,11 +57,11 @@ HANDLING), above. ### Comments The `Comments` plugin configuration specifies which VCS keywords and -comments are required for which file types. The valid types of file are -*global* (all file types), *bundler* (non-templated bundle files), -*sgenshi* (templated bundle files), *properties* (property files), *cfg* -(non-templated Cfg files), *tgenshi* (templated Cfg files), *infoxml* -(info.xml files), and *probe* (probe files). +comments are required for which file types. The valid types of file +are *global* (all file types), *bundler* (non-templated bundle files), +*genshibundler* (templated bundle files), *properties* (property files), +*cfg* (non-templated Cfg files), *genshi* or *cheetah* (templated Cfg +files), *infoxml* (info.xml files), and *probe* (probe files). The specific types (i.e., types other than "global") all supplement global; they do not override it. The exception is if you specify an |