diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-05-12 13:50:53 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-05-12 13:50:53 -0400 |
| commit | 9fece077393cec3fe0ac540b30eaa9a67b1a3d49 (patch) | |
| tree | c862fc4c30eb1667e5e01cde1c3b0f56d115e598 | |
| parent | c3edef5bd2b55266fee96327f17a093a0fb9cce4 (diff) | |
| download | bcfg2-9fece077393cec3fe0ac540b30eaa9a67b1a3d49.tar.gz bcfg2-9fece077393cec3fe0ac540b30eaa9a67b1a3d49.tar.bz2 bcfg2-9fece077393cec3fe0ac540b30eaa9a67b1a3d49.zip | |
catch errors base64 decoding encrypted properties data
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Properties.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py index 6f054fd33..bbca01ead 100644 --- a/src/lib/Bcfg2/Server/Plugins/Properties.py +++ b/src/lib/Bcfg2/Server/Plugins/Properties.py @@ -212,7 +212,7 @@ class XMLPropertyFile(Bcfg2.Server.Plugin.StructFile, PropertyFile): except UnicodeDecodeError: self.logger.info("Properties: Decrypted %s to gibberish, " "skipping" % el.tag) - except Bcfg2.Encryption.EVPError: + except (TypeError, Bcfg2.Encryption.EVPError): strict = self.xdata.get( "decrypt", SETUP.cfp.get(Bcfg2.Encryption.CFG_SECTION, "decrypt", |