From 74fe7cebd6f5024dbf336fd37f06644a4011dabe Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 20 Apr 2012 11:41:05 -0400 Subject: made Deltas and Genshi lint plugins respect command-line filelist --- src/lib/Bcfg2/Server/Lint/Deltas.py | 12 ++++++------ src/lib/Bcfg2/Server/Lint/Genshi.py | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/Lint/Deltas.py b/src/lib/Bcfg2/Server/Lint/Deltas.py index 7627b0cb0..cf91d1d13 100644 --- a/src/lib/Bcfg2/Server/Lint/Deltas.py +++ b/src/lib/Bcfg2/Server/Lint/Deltas.py @@ -12,9 +12,9 @@ class Deltas(Bcfg2.Server.Lint.ServerPlugin): def check_entry(self, basename, entry): for fname in list(entry.entries.keys()): - match = entry.specific.delta_reg.match(fname) - if match: - self.LintError("%s-file-used" % match.group('delta'), - "%s file used on %s: %s" % (match.group('delta'), - basename, - fname)) + if self.HandlesFile(fname): + match = entry.specific.delta_reg.match(fname) + if match: + self.LintError("%s-file-used" % match.group('delta'), + "%s file used on %s: %s" % + (match.group('delta'), basename, fname)) diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py index 739e829d0..c78366ae9 100755 --- a/src/lib/Bcfg2/Server/Lint/Genshi.py +++ b/src/lib/Bcfg2/Server/Lint/Genshi.py @@ -18,7 +18,8 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin): for eset in entries.values(): for fname, sdata in list(eset.entries.items()): - if fname.endswith(".genshi") or fname.endswith(".newtxt"): + if (self.HandlesFile(fname) and + (fname.endswith(".genshi") or fname.endswith(".newtxt"))): try: loader.load(sdata.name, cls=genshi.template.NewTextTemplate) -- cgit v1.2.3-1-g7c22