Fixed mistake in constructing snapshot_path
authorEd Bartosh <eduard.bartosh@intel.com>
Wed, 2 Oct 2013 10:31:35 +0000 (13:31 +0300)
committerGerrit Code Review <gerrit2@otctools.jf.intel.com>
Wed, 9 Oct 2013 17:51:26 +0000 (10:51 -0700)
Fixed snapshot path generation. Repomaker now makes repo in the right
location.

Change-Id: I59ff093d02fab32d5ee98346bb1ebb4808314b13
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
common/repoutils.py

index f71f371..5ff107c 100644 (file)
@@ -54,7 +54,6 @@ def get_repo_data(backenddb, base_url, base_path='/srv/download',
                              % (release_key, str(err)))
 
     latest_snapshot = '%s_%s' % (repo['Release'], release_id)
-    snapshot_dir = os.path.join(repo['SnapshotDir'], latest_snapshot)
     prerelease_dir = os.path.join(repo['PrereleaseDir'], latest_snapshot)
     build_id = '%s.%s' % (latest_snapshot, tstamp or 'xxx')
 
@@ -65,9 +64,9 @@ def get_repo_data(backenddb, base_url, base_path='/srv/download',
                                       ARCH_MAP.get(arch, arch), 'packages')
 
     return {'snapshot': latest_snapshot,
-            'snapshot_dir': snapshot_dir,
-            'snapshot_path': os.path.join(base_path, snapshot_dir),
-            'snapshot_url': os.path.join(base_url, snapshot_dir),
+            'snapshot_dir': repo['SnapshotDir'],
+            'snapshot_path': os.path.join(base_path, repo['SnapshotDir']),
+            'snapshot_url': os.path.join(base_url, repo['SnapshotDir']),
             'prerelease_dir': prerelease_dir,
             'prerelease_path': os.path.join(base_path, prerelease_dir),
             'prerelease_build_id': build_id,