commit dbf026112fd5d339916381d1827490be999dd787 Author: Till Maas opensource@till.name Date: Sun Oct 26 11:42:39 2014 +0100
sigulsign_unsigned: Add details to error message
scripts/sigulsign_unsigned.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) --- diff --git a/scripts/sigulsign_unsigned.py b/scripts/sigulsign_unsigned.py index ad7cf3f..a49d465 100755 --- a/scripts/sigulsign_unsigned.py +++ b/scripts/sigulsign_unsigned.py @@ -357,9 +357,9 @@ class SigulHelper(object): self.arch = arch
command = self.build_cmdline('get-public-key', self.key) - ret, pubkey = self.run_command(command)[0:2] + ret, pubkey, stderr = self.run_command(command) if ret != 0: - raise ValueError("Invalid key or password") + raise ValueError("Invalid key or password: " + stderr) self.keyid, self.v3 = get_key_info(pubkey)
def build_cmdline(self, *args): @@ -487,8 +487,9 @@ if __name__ == "__main__": config_file=opts.sigul_config_file, arch=opts.arch, ask=True, ask_with_agent=opts.gpg_agent) - except ValueError: - logging.error('Error validating passphrase for key %s' % key) + except ValueError as error: + logging.error('Error validating passphrase for key %s: %s', key, + error) sys.exit(1)
# setup the koji session
rel-eng@lists.fedoraproject.org