From 5540d1f60b6ff33056d2c355ccab445023500d10 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 30 Oct 2012 10:58:32 -0400
Subject: removed support for .cat/.diff files

---
 src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py  | 28 ------------------
 src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py | 35 -----------------------
 src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py      | 17 +----------
 3 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py
 delete mode 100644 src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py
deleted file mode 100644
index 49a5a85b3..000000000
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py
+++ /dev/null
@@ -1,28 +0,0 @@
-""" Handle .cat files, which append lines to and remove lines from
-plaintext files """
-
-from Bcfg2.Server.Plugins.Cfg import CfgFilter
-
-
-class CfgCatFilter(CfgFilter):
-    """ CfgCatFilter appends lines to and remove lines from plaintext
-    :ref:`server-plugins-generators-Cfg` files"""
-
-    #: Handle .cat files
-    __extensions__ = ['cat']
-
-    #: .cat files are deprecated
-    deprecated = True
-
-    def modify_data(self, entry, metadata, data):
-        datalines = data.strip().split('\n')
-        for line in self.data.split('\n'):
-            if not line:
-                continue
-            if line.startswith('+'):
-                datalines.append(line[1:])
-            elif line.startswith('-'):
-                if line[1:] in datalines:
-                    datalines.remove(line[1:])
-        return "\n".join(datalines) + "\n"
-    modify_data.__doc__ = CfgFilter.modify_data.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py
deleted file mode 100644
index da506a195..000000000
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py
+++ /dev/null
@@ -1,35 +0,0 @@
-""" Handle .diff files, which apply diffs to plaintext files """
-
-import os
-import tempfile
-from Bcfg2.Server.Plugin import PluginExecutionError
-from subprocess import Popen, PIPE
-from Bcfg2.Server.Plugins.Cfg import CfgFilter
-
-
-class CfgDiffFilter(CfgFilter):
-    """ CfgDiffFilter applies diffs to plaintext
-    :ref:`server-plugins-generators-Cfg` files """
-
-    #: Handle .diff files
-    __extensions__ = ['diff']
-
-    #: .diff files are deprecated
-    deprecated = True
-
-    def modify_data(self, entry, metadata, data):
-        basehandle, basename = tempfile.mkstemp()
-        open(basename, 'w').write(data)
-        os.close(basehandle)
-
-        cmd = ["patch", "-u", "-f", basename]
-        patch = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-        stderr = patch.communicate(input=self.data)[1]
-        ret = patch.wait()
-        output = open(basename, 'r').read()
-        os.unlink(basename)
-        if ret != 0:
-            raise PluginExecutionError("Error applying diff %s: %s" %
-                                       (self.name, stderr))
-        return output
-    modify_data.__doc__ = CfgFilter.modify_data.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index eded970a6..02090e9ec 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -867,26 +867,11 @@ class CfgLint(Bcfg2.Server.Lint.ServerPlugin):
 
     def Run(self):
         for basename, entry in list(self.core.plugins['Cfg'].entries.items()):
-            self.check_delta(basename, entry)
             self.check_pubkey(basename, entry)
 
     @classmethod
     def Errors(cls):
-        return {"cat-file-used": "warning",
-                "diff-file-used": "warning",
-                "no-pubkey-xml": "warning"}
-
-    def check_delta(self, basename, entry):
-        """ check that no .cat or .diff files are in use """
-        for fname, handler in entry.entries.items():
-            path = handler.name
-            if self.HandlesFile(path) and isinstance(handler, CfgFilter):
-                extension = fname.split(".")[-1]
-                if extension in ["cat", "diff"]:
-                    self.LintError("%s-file-used" % extension,
-                                   "%s file used on %s: %s" % (extension,
-                                                               basename,
-                                                               fname))
+        return {"no-pubkey-xml": "warning"}
 
     def check_pubkey(self, basename, entry):
         """ check that privkey.xml files have corresponding pubkey.xml
-- 
cgit v1.2.3-1-g7c22