summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-13 15:21:26 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-13 15:21:26 -0400
commit76f042e6e465af8a3fbc4fb145661c37626e9958 (patch)
tree9d120be43aa0abb152e5493e0ad61a3265604470 /src
parentd81674cc05d820bfd9cced9bbf30717f8fd2b468 (diff)
downloadbcfg2-76f042e6e465af8a3fbc4fb145661c37626e9958.tar.gz
bcfg2-76f042e6e465af8a3fbc4fb145661c37626e9958.tar.bz2
bcfg2-76f042e6e465af8a3fbc4fb145661c37626e9958.zip
bcfg2-crypt: fixed logic for determining if a encrypt/decrypt failed
Diffstat (limited to 'src')
-rwxr-xr-xsrc/lib/Bcfg2/Server/Encryption.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py
index 6169d4da7..c0c2816ac 100755
--- a/src/lib/Bcfg2/Server/Encryption.py
+++ b/src/lib/Bcfg2/Server/Encryption.py
@@ -586,10 +586,11 @@ class CLI(object):
% fname)
tool = tools[0]
mode = "encrypt"
+ self.logger.debug("Encrypting %s file %s" % (ftype, fname))
if data is None:
data = getattr(tool, mode)()
- if data is None:
+ if data in [False, None]:
self.logger.error("Failed to %s %s, skipping" % (mode, fname))
continue
if Bcfg2.Options.setup.stdout: