Fix interface mismatch of extract_image_conf

The only one parameter of function imagedata.extract_image_conf is image
configuration rpm location, fix incorrect call for it.

Change-Id: I33a56b8718a90dddddbc11f88d70a92fc221ec11
Signed-off-by: Lin Yang <lin.a.yang@intel.com>

diff --git a/common/repomaker.py b/common/repomaker.py
index b75d366..45124c7 100644 (file)
--- a/common/repomaker.py
+++ b/common/repomaker.py
@@ -195,7 +195,7 @@ class RepoMaker(object):
                                                              filename)))
             # get names and content of .ks files from rpm
             if is_imageconf:
-                self.load_imagedata(name, fpath)
+                self.load_imagedata(fpath)
 
         # Generate or update build.xml
         self.update_builddata(name, repo_dirs)
@@ -234,7 +234,7 @@ class RepoMaker(object):
         """
         return bool(self.imagedata.images)
 
-    def load_imagedata(self, repo, rpm):
+    def load_imagedata(self, rpm):
         """
 
         Args:
@@ -242,7 +242,7 @@ class RepoMaker(object):
         Raises: ImageDataError
 
         """
-        self.imagedata.extract_image_conf(rpm, repo)
+        self.imagedata.extract_image_conf(rpm)
 
     def gen_image_info(self, updated_ks=None):
         """

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index 766cc7b..1b3a8f4 100755 (executable)
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -142,7 +142,7 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base):
                 raise LocalError("Image configuration not found in %s" %
                         snapshot.path)
             for rpm in img_conf_list:
-                repomaker.load_imagedata(repo['Name'], rpm)
+                repomaker.load_imagedata(rpm)
 
         # whether exist ks poin to the repo
         if not repomaker.has_images():