fix some errors when working with backenddb

Change-Id: I0aaa891bde3c6151a7e9e81212054d5f5b7adba3
Signed-off-by: Hasan Wan <hasan.wan@intel.com>

diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py
index f47426e..53c7b82 100755 (executable)
--- a/job_pre_release_obs.py
+++ b/job_pre_release_obs.py
@@ -39,10 +39,10 @@ def update_ks(imagedata, backenddb):
                 if match:
                     release_name = match.group(1)
                     # Get repo info from backend DB
-                    repo = backenddb.get_repo_by_name(release_name)
+                    repo = backenddb.get_repo_data_by_name(release_name)
                     repo_url = os.path.join(os.getenv("URL_PUBLIC_REPO_BASE",
                                                       "/"),
-                                            repo['snapshot_path'],
+                                            repo['snapshot_dir'],
                                             repo['latest_snapshot'])
                     line = re.sub(r'--baseurl=http.*@BUILD_ID@',
                                   r'--baseurl=%s' %repo_url, line)
@@ -85,7 +85,7 @@ def make_repo(project, repo, backenddb):
     """
 
     # Make build id from latest snapshot + project suffix
-    target_project =  project.split(':')[:-1][3:]
+    target_project =  ':'.join(project.split(':')[:-1][3:])
     try:
         data = backenddb.get_repo_data(target_project)
     except BackendDBError, err:
@@ -98,7 +98,7 @@ def make_repo(project, repo, backenddb):
 
     # The repo local path on the running target server
     path_to_repo = os.path.join(os.getenv('PATH_REPO_BASE', '/srv/download'),
-                                data['prerelease_path'])
+                                data['prerelease_dir'])
 
     # Convert live repo to download structure
     repomaker = RepoMaker(build_id, path_to_repo)
@@ -117,9 +117,8 @@ def make_repo(project, repo, backenddb):
         # let's take it from target repo, only one package repo is enough
         path_target_repo = os.path.join(os.getenv('PATH_REPO_BASE',
                                                   '/srv/download'),
-                                        data['snapshot_path'],
-                                        latest_snapshot,
-                                        data['packages_path'][0])
+                                        data['snapshot_dir'],
+                                        latest_snapshot)
         # Add image configuration to pre-release repo
         for rpm in find_files(path_target_repo,
                               prefix="image-configurations-",