diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-07 08:26:39 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-07 08:26:39 -0500 |
| commit | 7db65d41386768a5081c34c16db17e82b96a5b7a (patch) | |
| tree | 07ff91016b461afb44ced8247bafcba2d1f21ae2 /src/lib/Bcfg2/Server/Plugin | |
| parent | 65caf3f586d7985d88652c73e7b214ba3e40eac2 (diff) | |
| download | bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.gz bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.bz2 bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.zip | |
made XInlcude and Encryption support more consistent
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 2daf4e0df..9bdfe347f 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -517,9 +517,6 @@ class StructFile(XMLFileBacked, Debuggable): #: the file being cached __identifier__ = None - #: Whether or not encryption support is enabled in this file - encryption = True - #: Callbacks used to determine if children of items with the given #: tags should be included in the return value of #: :func:`Bcfg2.Server.Plugin.helpers.StructFile.Match` and @@ -564,7 +561,7 @@ class StructFile(XMLFileBacked, Debuggable): self.logger.error('Genshi parse error in %s: %s' % (self.name, err)) - if self.encryption and HAS_CRYPTO: + if HAS_CRYPTO: strict = self.xdata.get( "decrypt", self.setup.cfp.get(Bcfg2.Server.Encryption.CFG_SECTION, @@ -879,7 +876,6 @@ class XMLSrc(XMLFileBacked): class InfoXML(StructFile): """ InfoXML files contain Group, Client, and Path tags to set the metadata (permissions, owner, etc.) of files. """ - encryption = False _include_tests = StructFile._include_tests _include_tests['Path'] = lambda el, md, entry, *args: \ |