From bc1394e2062983f3da22f9ec687db8e6de0567a0 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 9 May 2012 10:51:17 -0400 Subject: fixed MergeFiles bcfg2-lint plugin --- src/lib/Bcfg2/Server/Lint/MergeFiles.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/Lint/MergeFiles.py') diff --git a/src/lib/Bcfg2/Server/Lint/MergeFiles.py b/src/lib/Bcfg2/Server/Lint/MergeFiles.py index 797de6ed9..68d010316 100644 --- a/src/lib/Bcfg2/Server/Lint/MergeFiles.py +++ b/src/lib/Bcfg2/Server/Lint/MergeFiles.py @@ -2,6 +2,7 @@ import os import copy from difflib import SequenceMatcher import Bcfg2.Server.Lint +from Bcfg2.Server.Plugins.Cfg import CfgGenerator class MergeFiles(Bcfg2.Server.Lint.ServerPlugin): """ find Probes or Cfg files with multiple similar files that @@ -20,7 +21,9 @@ class MergeFiles(Bcfg2.Server.Lint.ServerPlugin): def check_cfg(self): for filename, entryset in self.core.plugins['Cfg'].entries.items(): - for mset in self.get_similar(entryset.entries): + candidates = dict([(f, e) for f, e in entryset.entries.items() + if isinstance(e, CfgGenerator)]) + for mset in self.get_similar(candidates): self.LintError("merge-cfg", "The following files are similar: %s. " "Consider merging them into a single Genshi " -- cgit v1.2.3-1-g7c22