← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/fix-make-lp-user into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/fix-make-lp-user into lp:launchpad.

Commit message:
Fix make-lp-user, broken by the fix for bug 1576142.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/fix-make-lp-user/+merge/363575

I broke this in r18443 and managed not to notice until now.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/fix-make-lp-user into lp:launchpad.
=== modified file 'utilities/make-lp-user'
--- utilities/make-lp-user	2015-05-07 09:29:30 +0000
+++ utilities/make-lp-user	2019-02-23 08:14:58 +0000
@@ -165,10 +165,9 @@
         # We already have this key.
         return
 
-    algorithm = GPGKeyAlgorithm.items[key.algorithm]
     can_encrypt = True
     lpkey = gpgkeyset.new(
-        person.id, key.keyid, fingerprint, key.keysize, algorithm,
+        person.id, key.keyid, fingerprint, key.keysize, key.algorithm,
         active=True, can_encrypt=can_encrypt)
     Store.of(person).add(lpkey)
 


Follow ups