From 4755c72601c11b800650f942f855cee286c50356 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 10 Oct 2012 16:05:28 +0200
Subject: cherry pick robustness fixes for keyid (allow leading 0x, allow
 lowercase)

---
 apt/auth.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'apt/auth.py')

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'" % (
-- 
cgit v1.2.3