summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Lint/MergeFiles.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-09-19 11:04:03 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-09-19 11:04:03 -0400
commitfe9b75662276326898458a68744b920ebd9d46b8 (patch)
tree999cf9ca885d38e23305408b37ff0b662686832d /src/lib/Server/Lint/MergeFiles.py
parente6489338056d55805a66383bcd5cda6ed8caa22b (diff)
downloadbcfg2-fe9b75662276326898458a68744b920ebd9d46b8.tar.gz
bcfg2-fe9b75662276326898458a68744b920ebd9d46b8.tar.bz2
bcfg2-fe9b75662276326898458a68744b920ebd9d46b8.zip
added Defaults plugin
Diffstat (limited to 'src/lib/Server/Lint/MergeFiles.py')
-rw-r--r--src/lib/Server/Lint/MergeFiles.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Server/Lint/MergeFiles.py b/src/lib/Server/Lint/MergeFiles.py
index 27e7aa99a..52fea3d9b 100644
--- a/src/lib/Server/Lint/MergeFiles.py
+++ b/src/lib/Server/Lint/MergeFiles.py
@@ -1,7 +1,6 @@
import os
from copy import deepcopy
from difflib import SequenceMatcher
-import Bcfg2.Options
import Bcfg2.Server.Lint
class MergeFiles(Bcfg2.Server.Lint.ServerPlugin):
@@ -27,10 +26,10 @@ class MergeFiles(Bcfg2.Server.Lint.ServerPlugin):
def check_probes(self):
probes = self.core.plugins['Probes'].probes.entries
for mset in self.get_similar(probes):
- self.LintError("merge-cfg",
- "The following probes are similar: %s. "
- "Consider merging them into a single probe." %
- ", ".join([p for p in mset]))
+ self.LintError("merge-cfg",
+ "The following probes are similar: %s. "
+ "Consider merging them into a single probe." %
+ ", ".join([p for p in mset]))
def get_similar(self, entries):
if "threshold" in self.config: