diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:30:21 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:30:21 -0500 |
| commit | 7881b0e34809e75d1671763a0baf2e8287391290 (patch) | |
| tree | a7c78b792ca21092a24102b389506bf3d6932e09 /src/lib/Bcfg2/Server/Encryption.py | |
| parent | b5b26415161e715fe4d22d69328b06801ff7124d (diff) | |
| download | bcfg2-7881b0e34809e75d1671763a0baf2e8287391290.tar.gz bcfg2-7881b0e34809e75d1671763a0baf2e8287391290.tar.bz2 bcfg2-7881b0e34809e75d1671763a0baf2e8287391290.zip | |
bcfg2-crypt: Avoid duplicate decrypt/encrypt when auto-determining mode
Diffstat (limited to 'src/lib/Bcfg2/Server/Encryption.py')
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 12 |
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) |