launchpad-reviewers team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/608846-make-lp-user-ssh-keys into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #608846 make-lp-user calls ISSHKeySet.new() with invalid number of arguments
  https://bugs.launchpad.net/bugs/608846


This trivial branch fixes make-lp-user's call to ISSHKeySet.new() after the latters' arguments have been changed.

utilities/soyuz-sampledata-setup.py uses make-lp-user and this bug blocks it from being usable.
-- 
https://code.launchpad.net/~jelmer/launchpad/608846-make-lp-user-ssh-keys/+merge/30701
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/608846-make-lp-user-ssh-keys into lp:launchpad/devel.

=== modified file 'utilities/make-lp-user'
--- utilities/make-lp-user	2010-04-27 19:48:39 +0000
+++ utilities/make-lp-user	2010-07-22 19:08:53 +0000
@@ -46,7 +46,6 @@
 from canonical.launchpad.interfaces import (
     IPersonSet,
     ISSHKeySet,
-    SSHKeyType,
     TeamMembershipStatus,
     )
 from canonical.launchpad.interfaces.gpghandler import IGPGHandler
@@ -111,8 +110,8 @@
     ssh_dir = os.path.expanduser('~/.ssh')
     key_set = getUtility(ISSHKeySet)
     key_guesses = [
-        (SSHKeyType.RSA, 'id_rsa.pub'),
-        (SSHKeyType.DSA, 'id_dsa.pub'),
+        ("ssh-rsa", 'id_rsa.pub'),
+        ("ssh-dsa", 'id_dsa.pub'),
         ]
     for key_type, guessed_filename in key_guesses:
         guessed_filename = os.path.join(ssh_dir, guessed_filename)
@@ -125,7 +124,8 @@
         except (OSError, IOError):
             continue
         public_key = public_key.split()[1]
-        key_set.new(person, key_type, public_key, 'Added by utility script.')
+        key_set.new(person,
+            "%s %s %s" % (key_type, public_key, 'Added by utility script.'))
         print 'Registered SSH key: %s' % (guessed_filename,)