commit 4e60f41905557d9b827cbbb04dfb09776a5e28c3
author Jenkins <jenkins@review.openstack.org> Mon Dec 30 23:27:16 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Dec 30 23:27:16 2013 +0000
tree 08761ef250ac3df5fad9d6856f3ef06758a57b2c
parent 8f8ec6e7b44e9f9bad18598c5ba06f97f3408916
parent 7b73168c2e7c307a9ac718087f1acd8af1c69ded

Merge "Rename launchpad parameter to group"

jeepyb/cmd/update_blueprint.py

diff --git a/jeepyb/cmd/update_blueprint.py b/jeepyb/cmd/update_blueprint.py
index b0865aa..3e3604b 100644
--- a/jeepyb/cmd/update_blueprint.py
+++ b/jeepyb/cmd/update_blueprint.py
@@ -70,7 +70,7 @@
     if p.is_no_launchpad_blueprints(project):
         return
 
-    project = p.git2lp(project)
+    project = p.project_to_group(project)
     spec = launchpad.projects[project].getSpecification(name=name)
     if not spec:
         return

jeepyb/cmd/update_bug.py

diff --git a/jeepyb/cmd/update_bug.py b/jeepyb/cmd/update_bug.py
index be24c46..3868651 100644
--- a/jeepyb/cmd/update_bug.py
+++ b/jeepyb/cmd/update_bug.py
@@ -272,7 +272,7 @@
     if p.is_no_launchpad_bugs(project):
         return []
 
-    project = p.git2lp(project)
+    project = p.project_to_group(project)
 
     part1 = r'^[\t ]*(?P<prefix>[-\w]+)?[\s:]*'
     part2 = r'(?:\b(?:bug|lp)\b[\s#:]*)+'

jeepyb/projects.py

diff --git a/jeepyb/projects.py b/jeepyb/projects.py
index 090a891..083da4d 100644
--- a/jeepyb/projects.py
+++ b/jeepyb/projects.py
@@ -31,11 +31,10 @@
                                   'PROJECTS_YAML')
 
 
-def git2lp(project_full_name):
-    try:
-        return registry[project_full_name]['launchpad']
-    except KeyError:
-        return u.short_project_name(project_full_name)
+def project_to_group(project_full_name):
+    return registry[project_full_name].get(
+        'group', registry[project_full_name].get(
+            'launchpad', u.short_project_name(project_full_name)))
 
 
 def _is_no_launchpad(project_full_name, obj_type):