From 817b4e4b49867288648603c711be388fcbf62265 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 17 May 2012 14:59:13 -0400
Subject: fixed merge error with Lint.Deltas

---
 src/lib/Bcfg2/Server/Lint/Deltas.py | 25 +++++++++++++++++++++++++
 src/lib/Server/Lint/Deltas.py       | 25 -------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 src/lib/Bcfg2/Server/Lint/Deltas.py
 delete mode 100644 src/lib/Server/Lint/Deltas.py

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Lint/Deltas.py b/src/lib/Bcfg2/Server/Lint/Deltas.py
new file mode 100644
index 000000000..114f2e348
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Lint/Deltas.py
@@ -0,0 +1,25 @@
+import Bcfg2.Server.Lint
+from Bcfg2.Server.Plugins.Cfg import CfgFilter
+
+class Deltas(Bcfg2.Server.Lint.ServerPlugin):
+    """ Warn about usage of .cat and .diff files """
+
+    def Run(self):
+        """ run plugin """
+        if 'Cfg' in self.core.plugins:
+            cfg = self.core.plugins['Cfg']
+            for basename, entry in list(cfg.entries.items()):
+                self.check_entry(basename, entry)
+
+    @classmethod
+    def Errors(cls):
+        return {"cat-file-used":"warning",
+                "diff-file-used":"warning"}
+
+    def check_entry(self, basename, entry):
+        for fname, processor in entry.entries.items():
+            if self.HandlesFile(fname) and isinstance(processor, CfgFilter):
+                extension = fname.split(".")[-1]
+                self.LintError("%s-file-used" % extension,
+                               "%s file used on %s: %s" %
+                               (extension, basename, fname))
diff --git a/src/lib/Server/Lint/Deltas.py b/src/lib/Server/Lint/Deltas.py
deleted file mode 100644
index 114f2e348..000000000
--- a/src/lib/Server/Lint/Deltas.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import Bcfg2.Server.Lint
-from Bcfg2.Server.Plugins.Cfg import CfgFilter
-
-class Deltas(Bcfg2.Server.Lint.ServerPlugin):
-    """ Warn about usage of .cat and .diff files """
-
-    def Run(self):
-        """ run plugin """
-        if 'Cfg' in self.core.plugins:
-            cfg = self.core.plugins['Cfg']
-            for basename, entry in list(cfg.entries.items()):
-                self.check_entry(basename, entry)
-
-    @classmethod
-    def Errors(cls):
-        return {"cat-file-used":"warning",
-                "diff-file-used":"warning"}
-
-    def check_entry(self, basename, entry):
-        for fname, processor in entry.entries.items():
-            if self.HandlesFile(fname) and isinstance(processor, CfgFilter):
-                extension = fname.split(".")[-1]
-                self.LintError("%s-file-used" % extension,
-                               "%s file used on %s: %s" %
-                               (extension, basename, fname))
-- 
cgit v1.2.3-1-g7c22