Renamed OBS_PREFIX -> PROJECT_PREFIX

This is done due to refactoring purposes to make it possible for obs.py
to import common module.

Change-Id: I511a9ea57e320930a93bb5c1b45306287e832a59
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Reviewed-on: https://otctools.jf.intel.com/review/10670
Tested-by: OTC Tools Tester <ed.bartosh@linux.intel.com>
Reviewed-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/repa/common.py b/repa/common.py
index 1d54309..b161077 100644 (file)
--- a/repa/common.py
+++ b/repa/common.py
@@ -31,7 +31,7 @@ Common functions, classes, exceptions.
 
 import json
 
-from repa.obs import OBS_PREFIX
+OBS_PROJECT_PREFIX = "home:prerelease:"
 
 class RepaException(Exception):
     """Custom repa exception. All repa modules should use it."""
@@ -39,7 +39,7 @@ class RepaException(Exception):
 
 def get_project_by_name(obs, name, target):
     """Lookup for a project in OBS by submission or group name."""
-    projects = list(obs.get_projects('^%s%s:%s$' % (OBS_PREFIX, target,
+    projects = list(obs.get_projects('^%s%s:%s$' % (OBS_PROJECT_PREFIX, target,
                                                     name.replace('/', ':'))))
     if not projects:
         raise RepaException('OBS project not found for %s %s' % \

diff --git a/repa/group.py b/repa/group.py
index ae430ae..fd8669b 100755 (executable)
--- a/repa/group.py
+++ b/repa/group.py
@@ -37,8 +37,8 @@ from collections import defaultdict
 from StringIO import StringIO
 
 from repa.main import sub_main
-from repa.obs import OBS, OBS_PREFIX
-from repa.common import RepaException, get_project_by_name
+from repa.obs import OBS
+from repa.common import RepaException, get_project_by_name, OBS_PROJECT_PREFIX
 
 
 def check_target_prj(submissions):
@@ -92,7 +92,8 @@ def create_group_project(obs, submissions, meta, comment):
                                   timestamp)
     gmeta = {'name': name, 'obs_target_prj': target_prj,
              'submissions': submissions, 'comment': comment}
-    project = '%s%s:%s' % (OBS_PREFIX, str(target_prj), name.replace('/', ':'))
+    project = '%s%s:%s' % (OBS_PROJECT_PREFIX, str(target_prj),
+                           name.replace('/', ':'))
 
     saved = sys.stdout
     sys.stdout = StringIO()

diff --git a/repa/list.py b/repa/list.py
index c64daf9..7e720ef 100755 (executable)
--- a/repa/list.py
+++ b/repa/list.py
@@ -33,7 +33,8 @@ import sys
 import os
 import json
 
-from repa.obs import OBS, OBS_PREFIX
+from repa.common import OBS_PROJECT_PREFIX
+from repa.obs import OBS
 from repa.main import sub_main
 
 
@@ -85,7 +86,8 @@ def list_submissions(obs, regexp):
     """List submissions and groups."""
     # submissions
     groups = []
-    for project, desc in obs.get_projects('^%s.*%s' % (OBS_PREFIX, regexp)):
+    for project, desc in obs.get_projects('^%s.*%s' %
+                                          (OBS_PROJECT_PREFIX, regexp)):
         meta = json.loads(desc)
         if ':submitgroup:' in project:
             groups.append(meta)

diff --git a/repa/obs.py b/repa/obs.py
index 95f8877..6d4e858 100644 (file)
--- a/repa/obs.py
+++ b/repa/obs.py
@@ -46,8 +46,6 @@ from gitbuildsys.oscapi import OSC, ObsError, OSCError
 from gitbuildsys.utils import Temp
 
 
-OBS_PREFIX = "home:prerelease:"
-
 OSCRC_TEMPLATE = """[general]
 apiurl = %(apiurl)s
 plaintext_passwd=0