diff options
| author | Michael Vogt <egon@debian-devbox> | 2012-10-12 09:29:28 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2012-10-12 09:29:28 +0200 |
| commit | ada635b123bf1a1ebec2b3208742ab7fdaae43d6 (patch) | |
| tree | 903c41edc64d35881ed3a18192716fa09fe6fe5d /apt/auth.py | |
| parent | c018a7368c5f3546ee90ad6bb597d0708ab4cb28 (diff) | |
| parent | 4755c72601c11b800650f942f855cee286c50356 (diff) | |
| download | python-apt-ada635b123bf1a1ebec2b3208742ab7fdaae43d6.tar.gz | |
* apt/auth.py:
- support importing long keyids with leading 0x and mixed case
Diffstat (limited to 'apt/auth.py')
| -rw-r--r-- | apt/auth.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt/auth.py b/apt/auth.py index 742b5cc2..eff13b1a 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -175,7 +175,9 @@ def _add_key_from_keyserver(keyid, keyserver, tmp_keyring_dir): got_fingerprint = line.split(":")[9] # stop after the first to ensure no subkey trickery break - signing_key_fingerprint = keyid + # strip the leading "0x" is there is one and uppercase (as this is + # what gnupg is using) + signing_key_fingerprint = keyid.replace("0x", "").upper() if got_fingerprint != signing_key_fingerprint: raise AptKeyError( "Fingerprints do not match, not importing: '%s' != '%s'" % ( |
