From 9fece077393cec3fe0ac540b30eaa9a67b1a3d49 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 12 May 2014 13:50:53 -0400 Subject: catch errors base64 decoding encrypted properties data --- src/lib/Bcfg2/Server/Plugins/Properties.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", -- cgit v1.2.3-1-g7c22