summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsrc/lib/Bcfg2/Server/Encryption.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py
index c6b09df56..f30144d13 100755
--- a/src/lib/Bcfg2/Server/Encryption.py
+++ b/src/lib/Bcfg2/Server/Encryption.py
@@ -637,11 +637,13 @@ class CLI(object):
mode = "encrypt"
self.logger.debug("Encrypting %s file %s" % (ftype, fname))
- try:
- data = getattr(tool, mode)()
- except DecryptError:
- self.logger.error("Failed to %s %s, skipping" % (mode, fname))
- continue
+ if data is None:
+ try:
+ data = getattr(tool, mode)()
+ except DecryptError:
+ self.logger.error("Failed to %s %s, skipping" % (mode,
+ fname))
+ continue
if Bcfg2.Options.setup.stdout:
if len(Bcfg2.Options.setup.files) > 1:
print("----- %s -----" % fname)