summaryrefslogtreecommitdiff
path: root/apt/auth.py
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-03 10:25:26 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-03 10:25:26 +0200
commit7262bab8e520db7e326c219c24e996e20f91e906 (patch)
treef5ffac43239ade26d6a68fa5e6bc252530ab17be /apt/auth.py
parent5960003fc970480bd48b0cc1c0f8b5ed80af7dac (diff)
downloadpython-apt-7262bab8e520db7e326c219c24e996e20f91e906.tar.gz
fix tests
Diffstat (limited to 'apt/auth.py')
-rw-r--r--apt/auth.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/apt/auth.py b/apt/auth.py
index b8089d0c..74fea10b 100644
--- a/apt/auth.py
+++ b/apt/auth.py
@@ -192,9 +192,11 @@ def _add_key_from_keyserver(keyid, keyserver, tmp_keyring_dir):
# what gnupg is using)
signing_key_fingerprint = keyid.replace("0x", "").upper()
if got_fingerprint != signing_key_fingerprint:
+ # make the error match what gnupg >= 1.4.18 will output when
+ # it checks the key itself before importing it
raise AptKeyError(
- "Fingerprints do not match, not importing: '%s' != '%s'" % (
- signing_key_fingerprint, got_fingerprint))
+ "recv from '%s' failed for '%s'" % (
+ keyserver, signing_key_fingerprint))
# finally add it
add_key_from_file(tmp_export_keyring)