From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 31 May 2012 06:48:50 +0000 (+0300)
Subject: RpmGitRepository: make version-tag methods more flexible
X-Git-Tag: tizen/0.6.22-20150206~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8f2cac53e91766efcfa21cf7891bcbfac8dd898;p=tools%2Fgit-buildpackage.git

RpmGitRepository: make version-tag methods more flexible

Simplifies version_to_tag() and find_version() so that all string fields
(for the format string) are given in one dict. Now it's easier to
add support for new string fields (e.g. commitdate etc).

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
---

diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 8cfe1e18..562e135c 100755
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -147,7 +147,8 @@ def pristine_tar_build_orig(repo, orig_file, output_dir, options):
 def get_upstream_tree(repo, spec, options):
     """Determine the upstream tree from the given options"""
     if options.upstream_tree.upper() == 'TAG':
-        upstream_tree = repo.version_to_tag(options.upstream_tag, dict(upstreamversion=spec.upstreamversion), "Upstream")
+        tag_str_fields = dict(upstreamversion=spec.upstreamversion, vendor="Upstream")
+        upstream_tree = repo.version_to_tag(options.upstream_tag, tag_str_fields)
     elif options.upstream_tree.upper() == 'BRANCH':
         if not repo.has_branch(options.upstream_branch):
             raise GbpError("%s is not a valid branch" % options.upstream_branch)
@@ -470,7 +471,8 @@ def main(argv):
         # Tag (note: tags the exported version)
         if options.tag or options.tag_only:
             gbp.log.info("Tagging %s" % rpm.RpmPkgPolicy.compose_full_version(spec.version))
-            tag = repo.version_to_tag(options.packaging_tag, spec.version, options.vendor)
+            tag_str_fields = dict(spec.version, vendor=options.vendor)
+            tag = repo.version_to_tag(options.packaging_tag, tag_str_fields)
             if options.retag and repo.has_tag(tag):
                 repo.delete_tag(tag)
             repo.create_tag(name=tag, msg="%s release %s" % (options.vendor,
diff --git a/gbp/scripts/import_orig_rpm.py b/gbp/scripts/import_orig_rpm.py
index e6306fdf..3d204b2c 100755
--- a/gbp/scripts/import_orig_rpm.py
+++ b/gbp/scripts/import_orig_rpm.py
@@ -266,7 +266,8 @@ def main(argv):
                 gbp.log.info("Pristine-tar: commiting %s" % pristine_orig)
                 repo.pristine_tar.commit(pristine_orig, options.upstream_branch)
 
-            tag = repo.version_to_tag(options.upstream_tag, dict(upstreamversion=version), "Upstream")
+            tag_str_fields = dict(upstreamversion=version, vendor="Upstream")
+            tag = repo.version_to_tag(options.upstream_tag, tag_str_fields)
             repo.create_tag(name=tag,
                             msg="Upstream version %s" % version,
                             commit=commit,
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index e09eb629..b6ded2cc 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -143,7 +143,8 @@ def export_patches(repo, branch, options):
         raise GbpError, "Can't parse spec"
 
     # Find upstream version
-    upstream_commit = repo.find_version(options.upstream_tag, dict(upstreamversion=spec.upstreamversion), "Upstream")
+    tag_str_fields = dict(upstreamversion=spec.upstreamversion, vendor="Upstream")
+    upstream_commit = repo.find_version(options.upstream_tag, tag_str_fields)
     if not upstream_commit:
         raise GbpError, ("Couldn't find upstream version %s. Don't know on what base to import." % spec.upstreamversion)
 
@@ -234,7 +235,8 @@ def import_spec_patches(repo, branch, options):
         raise GbpError, "Can't parse spec"
 
     # Find upstream version
-    commit = repo.find_version(options.upstream_tag, dict(upstreamversion=spec.upstreamversion), "Upstream")
+    tag_str_fields = dict(upstreamversion=spec.upstreamversion, vendor="Upstream")
+    commit = repo.find_version(options.upstream_tag, tag_str_fields)
     if commit:
         commits=[commit]
     else:
@@ -296,7 +298,8 @@ def rebase_pq(repo, branch, options):
         raise GbpError, "Can't parse spec"
 
     # Find upstream version
-    upstream_commit = repo.find_version(options.upstream_tag, dict(upstreamversion=spec.upstreamversion), "Upstream")
+    tag_str_fields = dict(upstreamversion=spec.upstreamversion, vendor="Upstream")
+    upstream_commit = repo.find_version(options.upstream_tag, tag_str_fields)
     if not upstream_commit:
         raise GbpError, ("Couldn't find upstream version %s. Don't know on what base to import." % spec.upstreamversion)