Merge pull request #260 from coreos-inc/githubfix

GitHub api now returns ALL the visible repositories for user

endpoints/trigger.py

@@ -704,32 +704,25 @@ class GithubBuildTrigger(BuildTriggerHandler):
     except GithubException:
       raise RepositoryReadException('Unable to list user repositories')
 
-    personal = {
+    namespaces = {}
-      'personal': True,
+
-      'repos': [repo.full_name for repo in repos],
+    for repository in repos:
+      namespace = repository.owner.login
+      if not namespace in namespaces:
+        namespaces[namespace] = {
+          'personal': namespace == usr.login,
+          'repos': [],
           'info': {
-        'name': usr.login,
+            'name': namespace,
-        'avatar_url': usr.avatar_url,
+            'avatar_url': repository.owner.avatar_url
           }
         }
 
-    repos_by_org = [personal]
+      namespaces[namespace]['repos'].append(repository.full_name)
 
-    for org in usr.get_orgs():
+    entries = list(namespaces.values())
-      repo_list = []
+    entries.sort(key=lambda e: e['info']['name'])
-      for repo in org.get_repos(type='member'):
+    return entries
-        repo_list.append(repo.full_name)
-
-      repos_by_org.append({
-        'personal': False,
-        'repos': repo_list,
-        'info': {
-          'name': org.name or org.login,
-          'avatar_url': org.avatar_url
-        }
-      })
-
-    return repos_by_org
 
   def list_build_subdirs(self):
     config = self.config