diff options
Diffstat (limited to 'src/lib/Bcfg2')
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py index 6d6c82fab..f0f83c7e2 100755 --- a/src/lib/Bcfg2/Server/Encryption.py +++ b/src/lib/Bcfg2/Server/Encryption.py @@ -369,17 +369,20 @@ class PropertiesCryptoMixin(object): pname = element.get("encrypted") if pname in Bcfg2.Options.setup.passphrases: passphrase = Bcfg2.Options.setup.passphrases[pname] - elif self.passphrase: + else: if pname: self.logger.warning("Passphrase %s not found in %s, " "using passphrase given on command line" % (pname, Bcfg2.Options.setup.config)) - passphrase = self.passphrase - pname = self.pname - else: - raise PassphraseError("Multiple passphrases found in %s, " - "specify one on the command line with -p" % - Bcfg2.Options.setup.config) + if self.passphrase: + passphrase = self.passphrase + pname = self.pname + else: + self.logger.warning("No passphrase specified for %s element" % + element.tag) + raise PassphraseError("Multiple passphrases found in %s, " + "specify one on the command line with " + "-p" % Bcfg2.Options.setup.config) return (pname, passphrase) def _write(self, filename, data): |