launchpad-reviewers team mailing list archive

[Thomi Richards <thomi.richards@xxxxxxxxxxxxx>]

Thomi Richards has proposed merging lp:~thomir/launchpad/fix-gpg-key-retrieval into lp:launchpad.

Commit message:
Re-raise unexpected HTTP errors when talking to the GPG key server.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~thomir/launchpad/fix-gpg-key-retrieval/+merge/300556

Today I spent most of the day figuring out why lp staging was broken when trying to import gpg keys:

https://oops.canonical.com/?oopsid=c3f9fe0dc6a6cd9a1950f4cb87eccd64

The cause eventually was squid config-related - RT #93738 has been filed to fix the situation, but debugging was made much harder because we silently swallow some HTTP exceptions when talking to the key server.

This MP fixes that.

There are no tests because:
 1) This code isn't covered anyway
 2) This code is going to be deleted real soon now.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~thomir/launchpad/fix-gpg-key-retrieval into lp:launchpad.

=== modified file 'lib/lp/services/gpg/handler.py'
--- lib/lp/services/gpg/handler.py	2016-06-16 23:11:32 +0000
+++ lib/lp/services/gpg/handler.py	2016-07-20 05:31:15 +0000
@@ -504,6 +504,7 @@
                     raise GPGKeyDoesNotExistOnServer(fingerprint)
                 errorlog.globalErrorUtility.raising(sys.exc_info(), request)
                 raise GPGKeyTemporarilyNotFoundError(fingerprint)
+            raise
         except (TimeoutError, requests.RequestException) as exc:
             errorlog.globalErrorUtility.raising(sys.exc_info(), request)
             raise GPGKeyTemporarilyNotFoundError(fingerprint)