Delete the no use parameter.
authorLiu jue <juex.liu@intel.com>
Mon, 4 Aug 2014 06:30:45 +0000 (14:30 +0800)
committerLin Yang <lin.a.yang@intel.com>
Mon, 4 Aug 2014 07:33:44 +0000 (15:33 +0800)
The judgement of buildconf will leads to all repo use the same buildconf

Fixes: #2066

Change-Id: I07719e52dc2a55ab67741e4a45330df12a36f962

job_create_snapshot.py

index bc6522a..2d3057d 100755 (executable)
@@ -65,7 +65,7 @@ def trigger_image_creation(trigger_data):
         for index, data in enumerate(trigger_data[repo]):
             trigger_next('image_trigger_%s_%s' % (repo, index), data)
 
-def make_repo(project, backenddb, base_path, live_repo_base, buildconf=None):
+def make_repo(project, backenddb, base_path, live_repo_base):
     """
     make repo.
 
@@ -75,7 +75,6 @@ def make_repo(project, backenddb, base_path, live_repo_base, buildconf=None):
         backenddb (BackendDB): backenddb instance
         base_path (str): path to the location of snapshot
         live_repo_base (str): path to live repo
-        buildconf (str): content of OBS project build conf
     Raises:
         LocalError if can't create repos or can't find image configurations
     """
@@ -100,11 +99,10 @@ def make_repo(project, backenddb, base_path, live_repo_base, buildconf=None):
 
         # Get specific repo buildconf from OBS, put the buildconf together with
         # repo-md
-        if not buildconf:
-            build = BuildService(os.getenv("OBS_API_URL"),
-                                 os.getenv("OBS_API_USERNAME"),
-                                 os.getenv("OBS_API_PASSWD"))
-            buildconf = build.get_repo_config(project, repo['Name'])
+        build = BuildService(os.getenv("OBS_API_URL"),
+                             os.getenv("OBS_API_USERNAME"),
+                             os.getenv("OBS_API_PASSWD"))
+        buildconf = build.get_repo_config(project, repo['Name'])
 
         try:
             repomaker.add_repo(live_repo_path, repo['Name'],