diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:06:46 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-18 11:06:46 -0500 |
commit | 7161b78b261cdbd959bf6f42d0780ceb78bf2e64 (patch) | |
tree | b619e1b222476096122e64302efc29c214076e9c /src/lib/Bcfg2/Server/Plugin/helpers.py | |
parent | b79027f553c82be75e49bcf9bde2f92ab72304c7 (diff) | |
parent | c2133f115673670992048f3567c22e7478281a79 (diff) | |
download | bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.gz bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.tar.bz2 bcfg2-7161b78b261cdbd959bf6f42d0780ceb78bf2e64.zip |
Merge branch '1.3.1' into 1.4.x
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin/helpers.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 57edcb938..59796a556 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -577,15 +577,12 @@ class StructFile(XMLFileBacked): def Index(self): XMLFileBacked.Index(self) - if self.encryption: + if self.encryption and HAS_CRYPTO: strict = self.xdata.get( "decrypt", self.setup.cfp.get(Bcfg2.Encryption.CFG_SECTION, "decrypt", default="strict")) == "strict" for el in self.xdata.xpath("//*[@encrypted]"): - if not HAS_CRYPTO: - raise PluginExecutionError("%s: M2Crypto is not available" - % self.name) try: el.text = self._decrypt(el).encode('ascii', 'xmlcharrefreplace') |