removed support for info/:info files

4 files changed, 5 insertions, 86 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 5ffdde49a..c4316d785 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -31,17 +31,6 @@ except ImportError:
 
 LOGGER = logging.getLogger(__name__)
 
-#: a compiled regular expression for parsing info and :info files
-INFO_REGEX = re.compile('owner:(\s)*(?P<owner>\S+)|' +
-                        'group:(\s)*(?P<group>\S+)|' +
-                        'mode:(\s)*(?P<mode>\w+)|' +
-                        'secontext:(\s)*(?P<secontext>\S+)|' +
-                        'paranoid:(\s)*(?P<paranoid>\S+)|' +
-                        'sensitive:(\s)*(?P<sensitive>\S+)|' +
-                        'encoding:(\s)*(?P<encoding>\S+)|' +
-                        'important:(\s)*(?P<important>\S+)|' +
-                        'mtime:(\s)*(?P<mtime>\w+)|')
-
 
 def default_path_metadata():
     """ Get the default Path entry metadata from the config.
@@ -1296,7 +1285,7 @@ class EntrySet(Debuggable):
         """
         action = event.code2str()
 
-        if event.filename in ['info', 'info.xml', ':info']:
+        if event.filename == 'info.xml':
             if action in ['exists', 'created', 'changed']:
                 self.update_metadata(event)
             elif action == 'deleted':
@@ -1401,8 +1390,8 @@ class EntrySet(Debuggable):
         return Specificity(**kwargs)
 
     def update_metadata(self, event):
-        """ Process changes to or creation of info, :info, and
-        info.xml files for the EntrySet.
+        """ Process changes to or creation of info.xml files for the
+        EntrySet.
 
         :param event: An event that applies to an info handled by this
                       EntrySet
@@ -1414,24 +1403,9 @@ class EntrySet(Debuggable):
             if not self.infoxml:
                 self.infoxml = InfoXML(fpath)
             self.infoxml.HandleEvent(event)
-        elif event.filename in [':info', 'info']:
-            for line in open(fpath).readlines():
-                match = INFO_REGEX.match(line)
-                if not match:
-                    LOGGER.warning("Failed to match line in %s: %s" % (fpath,
-                                                                       line))
-                    continue
-                else:
-                    mgd = match.groupdict()
-                    for key, value in list(mgd.items()):
-                        if value:
-                            self.metadata[key] = value
-                    if len(self.metadata['mode']) == 3:
-                        self.metadata['mode'] = "0%s" % self.metadata['mode']
 
     def reset_metadata(self, event):
-        """ Reset metadata to defaults if info. :info, or info.xml are
-        removed.
+        """ Reset metadata to defaults if info.xml is removed.
 
         :param event: An event that applies to an info handled by this
                       EntrySet
@@ -1440,8 +1414,6 @@ class EntrySet(Debuggable):
         """
         if event.filename == 'info.xml':
             self.infoxml = None
-        elif event.filename in [':info', 'info']:
-            self.metadata = default_path_metadata()
 
     def bind_info_to_entry(self, entry, metadata):
         """ Shortcut to call :func:`bind_info` with the base
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py
deleted file mode 100644
index 5122d9aa1..000000000
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py
+++ /dev/null
@@ -1,46 +0,0 @@
-""" Handle info and :info files """
-
-import Bcfg2.Server.Plugin
-from Bcfg2.Server.Plugins.Cfg import CfgInfo
-
-
-class CfgLegacyInfo(CfgInfo):
-    """ CfgLegacyInfo handles :file:`info` and :file:`:info` files for
-    :ref:`server-plugins-generators-cfg` """
-
-    #: Handle :file:`info` and :file:`:info`
-    __basenames__ = ['info', ':info']
-
-    #: CfgLegacyInfo is deprecated.  Use
-    #: :class:`Bcfg2.Server.Plugins.Cfg.CfgInfoXML.CfgInfoXML` instead.
-    deprecated = True
-
-    def __init__(self, path):
-        CfgInfo.__init__(self, path)
-        self.path = path
-
-        #: The set of info metadata stored in the file
-        self.metadata = None
-    __init__.__doc__ = CfgInfo.__init__.__doc__
-
-    def bind_info_to_entry(self, entry, metadata):
-        self._set_info(entry, self.metadata)
-    bind_info_to_entry.__doc__ = CfgInfo.bind_info_to_entry.__doc__
-
-    def handle_event(self, event):
-        if event.code2str() == 'deleted':
-            return
-        self.metadata = dict()
-        for line in open(self.path).readlines():
-            match = Bcfg2.Server.Plugin.INFO_REGEX.match(line)
-            if not match:
-                self.logger.warning("Failed to parse line in %s: %s" %
-                                    (event.filename, line))
-                continue
-            else:
-                for key, value in list(match.groupdict().items()):
-                    if value:
-                        self.metadata[key] = value
-        if ('mode' in self.metadata and len(self.metadata['mode']) == 3):
-            self.metadata['mode'] = "0%s" % self.metadata['mode']
-    handle_event.__doc__ = CfgInfo.handle_event.__doc__
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index 02090e9ec..0d8116c23 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -781,13 +781,6 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
         badattr = [attr for attr in ['owner', 'group', 'mode']
                    if attr in new_entry]
         if badattr:
-            # check for info files and inform user of their removal
-            for ifile in ['info', ':info']:
-                info = os.path.join(self.path, ifile)
-                if os.path.exists(info):
-                    self.logger.info("Removing %s and replacing with info.xml"
-                                     % info)
-                    os.remove(info)
             metadata_updates = {}
             metadata_updates.update(self.metadata)
             for attr in badattr:
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
index c7db67301..581c7f2ce 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
@@ -256,7 +256,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                     self.skn = False
                 return
 
-        if event.filename in ['info', 'info.xml', ':info']:
+        if event.filename == 'info.xml':
             for entry in list(self.entries.values()):
                 entry.handle_event(event)
             return