diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-02 08:36:22 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-05 14:51:45 -0400 |
| commit | ec7ea9d2a7e1c7c15e52c866f8fc9bb84bb0920d (patch) | |
| tree | ec7c1cea95b384917d5d4ab7ba7104fa755046ff /src/sbin | |
| parent | b95a5c40d3d145e6a27ea4efcbc483e31f6aa635 (diff) | |
| download | bcfg2-ec7ea9d2a7e1c7c15e52c866f8fc9bb84bb0920d.tar.gz bcfg2-ec7ea9d2a7e1c7c15e52c866f8fc9bb84bb0920d.tar.bz2 bcfg2-ec7ea9d2a7e1c7c15e52c866f8fc9bb84bb0920d.zip | |
bcfg2-crypt: prevent traceback for certain decrypt failures
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-crypt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-crypt b/src/sbin/bcfg2-crypt index 7102d06a9..0ba84fa0a 100755 --- a/src/sbin/bcfg2-crypt +++ b/src/sbin/bcfg2-crypt @@ -158,6 +158,7 @@ class CfgDecryptor(Decryptor): except Bcfg2.Encryption.EVPError: self.logger.info("Could not decrypt %s with any passphrase" % self.filename) + return False def get_destination_filename(self, original_filename): if original_filename.endswith(".crypt"): @@ -417,7 +418,7 @@ def main(): # pylint: disable=R0912,R0915 if data is None: data = getattr(tool, mode)() - if data is False: + if not data: logger.error("Failed to %s %s, skipping" % (mode, fname)) continue if setup['crypt_stdout']: |