diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-31 09:13:56 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-31 09:13:56 -0400 |
| commit | 5c11b7068f27f4401edf18bd1964d84dd7a42f88 (patch) | |
| tree | 1e9871d8123dc8b45c272a01cbab395d64975427 /src | |
| parent | e599aeebbd74596d4c45612df83fe136b7bdcb90 (diff) | |
| download | bcfg2-5c11b7068f27f4401edf18bd1964d84dd7a42f88.tar.gz bcfg2-5c11b7068f27f4401edf18bd1964d84dd7a42f88.tar.bz2 bcfg2-5c11b7068f27f4401edf18bd1964d84dd7a42f88.zip | |
deprecated info/:info, .cat, and .diff files
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py | 1 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py | 1 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py | 1 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 10 |
4 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py index f6b175832..c25cf85f1 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCatFilter.py @@ -6,6 +6,7 @@ logger = logging.getLogger(__name__) class CfgCatFilter(CfgFilter): __extensions__ = ['cat'] + deprecated = True def modify_data(self, entry, metadata, data): datalines = data.strip().split('\n') diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py index 906666c21..579fd4005 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py @@ -9,6 +9,7 @@ logger = logging.getLogger(__name__) class CfgDiffFilter(CfgFilter): __extensions__ = ['diff'] + deprecated = True def modify_data(self, entry, metadata, data): basehandle, basename = tempfile.mkstemp() diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py index 85c13c1ac..3673cfcb2 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgLegacyInfo.py @@ -6,6 +6,7 @@ logger = logging.getLogger(__name__) class CfgLegacyInfo(CfgInfo): __basenames__ = ['info', ':info'] + deprecated = True def __init__(self, path): CfgInfo.__init__(self, path) diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 08b873948..61c7c5442 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -21,6 +21,7 @@ class CfgBaseFileMatcher(Bcfg2.Server.Plugin.SpecificData): __extensions__ = [] __ignore__ = [] __specific__ = True + deprecated = False def __init__(self, fname, spec, encoding): Bcfg2.Server.Plugin.SpecificData.__init__(self, fname, spec, encoding) @@ -227,11 +228,18 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): filters.append(ent) elif isinstance(ent, CfgVerifier): verifiers.append(ent) + if ent.deprecated: + if ent.__basenames__: + fdesc = "/".join(ent.__basenames__) + elif ent.__extensions__: + fdesc = "." + "/.".join(ent.__extensions__) + logger.warning("Cfg: %s: Use of %s files is deprecated" % + (ent.name, fdesc)) DEFAULT_INFO.bind_info_to_entry(entry, metadata) if len(info_handlers) > 1: logger.error("More than one info supplier found for %s: %s" % - (self.name, info_handlers)) + (entry.get("name"), info_handlers)) if len(info_handlers): info_handlers[0].bind_info_to_entry(entry, metadata) if entry.tag == 'Path': |