← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~lgp171188/launchpad:make-lp-user-improvements into launchpad:master

 

Guruprasad has proposed merging ~lgp171188/launchpad:make-lp-user-improvements into launchpad:master.

Commit message:
Add the following improvements to the `make-lp-user` script

* Support looking for ed25519 SSH keys and importing them.
* Disable sending email on importing an SSH key.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/448673
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:make-lp-user-improvements into launchpad:master.
diff --git a/utilities/make-lp-user b/utilities/make-lp-user
index c856fa3..4560709 100755
--- a/utilities/make-lp-user
+++ b/utilities/make-lp-user
@@ -97,7 +97,7 @@ def add_ssh_public_keys(person):
     """
     ssh_dir = os.path.expanduser("~/.ssh")
     key_set = getUtility(ISSHKeySet)
-    for filename in ("id_rsa.pub", "id_dsa.pub"):
+    for filename in ("id_rsa.pub", "id_dsa.pub", "id_ed25519.pub"):
         try:
             public_key_file = open(os.path.join(ssh_dir, filename))
             try:
@@ -106,7 +106,7 @@ def add_ssh_public_keys(person):
                 public_key_file.close()
         except OSError:
             continue
-        key_set.new(person, public_key)
+        key_set.new(person, public_key, send_notification=False)
         print("Registered SSH key: %s" % (filename,))
         break
     else:

Follow ups