Merge lp:~cosmos-door/ssh-import-id/fix-1565275 into lp:ssh-import-id

Proposed by Mitsuya Shibata
Status: Merged
Merged at revision: 210
Proposed branch: lp:~cosmos-door/ssh-import-id/fix-1565275
Merge into: lp:ssh-import-id
Diff against target: 20 lines (+2/-1)
1 file modified
ssh_import_id/__init__.py (+2/-1)
To merge this branch: bzr merge lp:~cosmos-door/ssh-import-id/fix-1565275
Reviewer Review Type Date Requested Status
Scott Moser Approve
Mitsuya Shibata (community) Needs Resubmitting
Review via email: mp+290796@code.launchpad.net

Description of the change

  * ssh_import_id/__init__.py:
    - add support to import multiple keys

To post a comment you must log in.
Revision history for this message
Mitsuya Shibata (cosmos-door) wrote :

Note: Perhaps fetch_keys_lp() doesn't need to modify.

Revision history for this message
Scott Moser (smoser) wrote :

you're right, fetch_keys_lp does not need modification.
Please remove that change.
Feel free to test with my ssh keys (gh:smoser or lp:smoser) as I have multiple in both places.

I'd +1 the rest of the change though.

review: Needs Fixing
211. By Mitsuya Shibata

  * ssh_import_id/__init__.py:
    - remove unneeded modification for launchpad from previous commit.

Revision history for this message
Mitsuya Shibata (cosmos-door) wrote :

Thank you for review! I pushed commit to remove unneeded changes.

review: Needs Resubmitting
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Looks like the comment was addressed. Anything else holding this up? Love to see this SRUed in Ubuntu.

Revision history for this message
Mitsuya Shibata (cosmos-door) wrote :

I'm waiting to be merged...
Should I ping to developer or any ML?

Revision history for this message
Scott Moser (smoser) :
review: Approve
Revision history for this message
Mitsuya Shibata (cosmos-door) wrote :

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ssh_import_id/__init__.py'
2--- ssh_import_id/__init__.py 2016-02-18 20:38:58 +0000
3+++ ssh_import_id/__init__.py 2016-04-04 15:56:30 +0000
4@@ -284,6 +284,7 @@
5 def fetch_keys_gh(ghid, useragent):
6 x_ratelimit_remaining = 'x-ratelimit-remaining'
7 help_url = 'https://developer.github.com/v3/#rate-limiting'
8+ keys = ""
9 try:
10 url = "https://api.github.com/users/%s/keys" % (quote_plus(ghid))
11 headers = {'User-Agent': user_agent()}
12@@ -297,7 +298,7 @@
13 print('GitHub REST API rate-limited this IP address. See %s' % help_url)
14 os._exit(1)
15 for keyobj in data:
16- keys = "%s %s@github/%s\n" % (keyobj['key'], ghid, keyobj['id'])
17+ keys += "%s %s@github/%s\n" % (keyobj['key'], ghid, keyobj['id'])
18 except (Exception,):
19 e = sys.exc_info()[1]
20 sys.stderr.write("ERROR: %s\n" % (str(e)))

Subscribers

People subscribed via source and target branches