From 7881b0e34809e75d1671763a0baf2e8287391290 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 12 Nov 2013 15:30:21 -0500 Subject: bcfg2-crypt: Avoid duplicate decrypt/encrypt when auto-determining mode --- src/lib/Bcfg2/Server/Encryption.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/lib') 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) -- cgit v1.2.3-1-g7c22