diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-08 08:10:16 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-08 08:10:16 -0400 |
commit | e1e194a573b3803fa7f45a646bbb36b2f164a3e1 (patch) | |
tree | e9b689d1be39d38279e0a16f010e8d5e573612ef /src/sbin/bcfg2-crypt | |
parent | 35851347089db1a092ec715cb183aec19f19e983 (diff) | |
parent | eef441c1acdf1d3d483647b153f721cbab4a8517 (diff) | |
download | bcfg2-e1e194a573b3803fa7f45a646bbb36b2f164a3e1.tar.gz bcfg2-e1e194a573b3803fa7f45a646bbb36b2f164a3e1.tar.bz2 bcfg2-e1e194a573b3803fa7f45a646bbb36b2f164a3e1.zip |
Merge branch 'maint'
Conflicts:
doc/appendix/files/mysql.txt
doc/getting_started/index.txt
doc/server/plugins/structures/bundler/kernel.txt
src/lib/Bcfg2/Server/MultiprocessingCore.py
src/lib/Bcfg2/Server/Plugin/interfaces.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/lib/Bcfg2/Server/Plugins/SSHbase.py
Diffstat (limited to 'src/sbin/bcfg2-crypt')
-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 6a92a0260..9190f1390 100755 --- a/src/sbin/bcfg2-crypt +++ b/src/sbin/bcfg2-crypt @@ -160,6 +160,7 @@ class CfgDecryptor(Decryptor): except Bcfg2.Server.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"): @@ -419,7 +420,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']: |