diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-07-18 16:05:23 +0300 |
---|---|---|
committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-07-18 16:05:23 +0300 |
commit | efe5da7ccc5949b743065220c63f791e5740cdf1 (patch) | |
tree | bb0946abb031d5ddcdd069ed59e7fe1f8f78331e | |
parent | bae44ddc98ae0ed15ae078cb7c2fc597dee48da5 (diff) |
manifest: add original branch name
Needed when branch names must not be mangled - e.g. when building
packages as the branch names are configured in package-specific
gbp.conf.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-x | bootstrap.py | 13 | ||||
-rw-r--r-- | test-repo-manifest.xml | 16 |
2 files changed, 15 insertions, 14 deletions
diff --git a/bootstrap.py b/bootstrap.py index 7ac9289..08bc922 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -55,10 +55,10 @@ class TestDataRepoManifest(RepoManifest): """Add new project to the manifest""" prj_e = self._doc.createElement('project') prj_e.setAttribute('name', name) - for branch, revision in branches.iteritems(): + for branch in branches: br_e = self._doc.createElement('branch') - br_e.setAttribute('name', branch) - br_e.setAttribute('revision', revision) + for key, val in branch.iteritems(): + br_e.setAttribute(key, val) prj_e.appendChild(br_e) self._doc.firstChild.appendChild(prj_e) @@ -165,12 +165,13 @@ def update_testrepo_manifest(manifest, pkg_name, branches): Update a manifest file describing the branches/sha1s of a test git repo used by the gbp buildpackage-rpm and pq unit tests. """ - out_branches = {} + branches_meta = [] for branch in branches: in_branch = 'srcdata/%s/%s' % (pkg_name, branch) sha = git_cmd('rev-parse', ['%s^0' % in_branch], True)[0] - out_branches[branch] = sha.strip() - manifest.add_project(pkg_name, out_branches) + branches_meta.append({'name': branch, 'orig_name': in_branch, + 'revision': sha.strip()}) + manifest.add_project(pkg_name, branches_meta) def update_pkg_branches(pkg_name, remote, force=False): diff --git a/test-repo-manifest.xml b/test-repo-manifest.xml index 52db554..2028724 100644 --- a/test-repo-manifest.xml +++ b/test-repo-manifest.xml @@ -1,19 +1,19 @@ <?xml version="1.0" ?> <gbp-test-manifest> <project name="gbp-test"> - <branch name="pq/master" revision="972ecde7c94eb00f4d310aa0e3e8f72ed215f591"/> - <branch name="master" revision="b82fd1a61db4221263b2c110f60c6d07cb0203df"/> - <branch name="upstream" revision="6450890aa002b0868537ee50cc1aea177fdcc941"/> + <branch name="master" orig_name="srcdata/gbp-test/master" revision="b82fd1a61db4221263b2c110f60c6d07cb0203df"/> + <branch name="upstream" orig_name="srcdata/gbp-test/upstream" revision="6450890aa002b0868537ee50cc1aea177fdcc941"/> + <branch name="pq/master" orig_name="srcdata/gbp-test/pq/master" revision="972ecde7c94eb00f4d310aa0e3e8f72ed215f591"/> </project> <project name="gbp-test-native2"> - <branch name="master" revision="3da6930adaaef1cf7c67c97244d72a4aaef13f00"/> + <branch name="master" orig_name="srcdata/gbp-test-native2/master" revision="3da6930adaaef1cf7c67c97244d72a4aaef13f00"/> </project> <project name="gbp-test-native"> - <branch name="master" revision="1b89d1d93044b12e4adc102f7c30feaabc41ba58"/> + <branch name="master" orig_name="srcdata/gbp-test-native/master" revision="1b89d1d93044b12e4adc102f7c30feaabc41ba58"/> </project> <project name="gbp-test2"> - <branch name="master-orphan" revision="33c84e86148c3707d2880f439529074296f03d29"/> - <branch name="master" revision="cd2763432f4ad93b29c6f22aee7f623552156a81"/> - <branch name="upstream" revision="6dccee0ab7689e5ae446d39535138ea39a88e70c"/> + <branch name="master" orig_name="srcdata/gbp-test2/master" revision="cd2763432f4ad93b29c6f22aee7f623552156a81"/> + <branch name="master-orphan" orig_name="srcdata/gbp-test2/master-orphan" revision="33c84e86148c3707d2880f439529074296f03d29"/> + <branch name="upstream" orig_name="srcdata/gbp-test2/upstream" revision="6dccee0ab7689e5ae446d39535138ea39a88e70c"/> </project> </gbp-test-manifest> |