diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-16 11:45:15 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-16 11:45:15 -0400 |
| commit | ebfdc702566ca59f8bf44e49c973d54073bdea14 (patch) | |
| tree | b1486452e2441e5d98df2c75a0195dbbfbaca7cc /src/lib/Bcfg2/Server/Encryption.py | |
| parent | e9db4e75a16354918d4ea7c51a295ea0bed0ec34 (diff) | |
| download | bcfg2-ebfdc702566ca59f8bf44e49c973d54073bdea14.tar.gz bcfg2-ebfdc702566ca59f8bf44e49c973d54073bdea14.tar.bz2 bcfg2-ebfdc702566ca59f8bf44e49c973d54073bdea14.zip | |
Encryption: minor fixes
Diffstat (limited to 'src/lib/Bcfg2/Server/Encryption.py')
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py index e64a6627f..dc707187c 100755 --- a/src/lib/Bcfg2/Server/Encryption.py +++ b/src/lib/Bcfg2/Server/Encryption.py @@ -367,8 +367,8 @@ class PropertiesCryptoMixin(object): """ Get the passphrase to use to encrypt or decrypt a given element """ pname = element.get("encrypted") - if pname in self.passphrases: - passphrase = self.passphrases[pname] + if pname in Bcfg2.Options.setup.passphrases: + passphrase = Bcfg2.Options.setup.passphrases[pname] elif self.passphrase: if pname: self.logger.warning("Passphrase %s not found in %s, " @@ -579,7 +579,7 @@ class CLI(object): if data is None: data = getattr(tool, mode)() - if not data: + if data is None: self.logger.error("Failed to %s %s, skipping" % (mode, fname)) continue if Bcfg2.Options.setup.stdout: |