Rename internal var debian_tag -> packaging_tag

This is done in sake of more general purpose naming, intended for
enabling rpm support: to allow logical naming for rpm and to
share as much code between debian and rpm tools as possible.

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

diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 91977fa2f9f9166bd8cf99cb3928b1c5ac06db15..7f63e2317ac876f869b9256ddd503d029eaa396b 100755 (executable)
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -417,7 +417,7 @@ def build_parser(name, prefix=None, git_treeish=None):
                       help="don't fail if the tag already exists")
     tag_group.add_boolean_config_file_option(option_name="sign-tags", dest="sign_tags")
     tag_group.add_config_file_option(option_name="keyid", dest="keyid")
-    tag_group.add_config_file_option(option_name="debian-tag", dest="debian_tag")
+    tag_group.add_config_file_option(option_name="debian-tag", dest="packaging_tag")
     tag_group.add_config_file_option(option_name="debian-tag-msg", dest="debian_tag_msg")
     tag_group.add_config_file_option(option_name="upstream-tag", dest="upstream_tag")
     orig_group.add_config_file_option(option_name="upstream-tree", dest="upstream_tree")
@@ -635,7 +635,7 @@ def main(argv):
                      extra_env={'GBP_CHANGES_FILE': changes,
                                 'GBP_BUILD_DIR': build_dir})()
         if options.tag or options.tag_only:
-            tag = repo.version_to_tag(options.debian_tag, source.changelog.version)
+            tag = repo.version_to_tag(options.packaging_tag, source.changelog.version)
             gbp.log.info("Tagging %s as %s" % (source.changelog.version, tag))
             if options.retag and repo.has_tag(tag):
                 repo.delete_tag(tag)

diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index e839252c3c1f0b0f7ce9287f6ad690addc42dac6..98b948b67497b2c2bcb82d7b34be8f85fa161b50 100755 (executable)
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -320,7 +320,7 @@ def build_parser(name):
     parser.add_boolean_config_file_option(option_name = "ignore-branch", dest="ignore_branch")
     naming_group.add_config_file_option(option_name="debian-branch", dest="packaging_branch")
     naming_group.add_config_file_option(option_name="upstream-tag", dest="upstream_tag")
-    naming_group.add_config_file_option(option_name="debian-tag", dest="debian_tag")
+    naming_group.add_config_file_option(option_name="debian-tag", dest="packaging_tag")
     naming_group.add_config_file_option(option_name="snapshot-number", dest="snapshot_number",
                       help="expression to determine the next snapshot number, default is '%(snapshot-number)s'")
     parser.add_config_file_option(option_name="git-log", dest="git_log",
@@ -431,7 +431,7 @@ def main(argv):
         else:
             since = ''
             if options.auto:
-                since = guess_documented_commit(cp, repo, options.debian_tag)
+                since = guess_documented_commit(cp, repo, options.packaging_tag)
                 if since:
                     msg = "Continuing from commit '%s'" % since
                 else:
@@ -439,7 +439,7 @@ def main(argv):
                 gbp.log.info(msg)
                 found_snapshot_banner = has_snapshot_banner(cp)
             else: # Fallback: continue from last tag
-                since = repo.find_version(options.debian_tag, cp['Version'])
+                since = repo.find_version(options.packaging_tag, cp['Version'])
                 if not since:
                     raise GbpError("Version %s not found" % cp['Version'])
 

diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index 2613940f7e128858b6c949b9f41d03d278dfc092..d0f8450f03e9e47dd703d43d22f619b3f0280267 100755 (executable)
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -158,8 +158,8 @@ def apply_debian_patch(repo, unpack_dir, src, options, tag):
                                  other_parents = parents,
                                  author=author,
                                  committer=committer)
-        if not options.skip_debian_tag:
-            repo.create_tag(repo.version_to_tag(options.debian_tag, src.version),
+        if not options.skip_packaging_tag:
+            repo.create_tag(repo.version_to_tag(options.packaging_tag, src.version),
                             msg="Debian release %s" % src.version,
                             commit=commit,
                             sign=options.sign_tags,
@@ -242,10 +242,10 @@ def build_parser(name):
     tag_group.add_config_file_option(option_name="keyid",
                       dest="keyid")
     tag_group.add_config_file_option(option_name="debian-tag",
-                      dest="debian_tag")
+                      dest="packaging_tag")
     tag_group.add_config_file_option(option_name="upstream-tag",
                       dest="upstream_tag")
-    tag_group.add_option("--skip-debian-tag",dest="skip_debian_tag",
+    tag_group.add_option("--skip-debian-tag",dest="skip_packaging_tag",
                          action="store_true", default=False,
                          help="Don't add a tag after importing the Debian patch")
 
@@ -335,15 +335,15 @@ def main(argv):
             upstream = DebianUpstreamSource(src.tgz)
             upstream = upstream.unpack(dirs['tmp'], options.filters)
 
-            format = [(options.upstream_tag, "Upstream"), (options.debian_tag, "Debian")][src.native]
+            format = [(options.upstream_tag, "Upstream"), (options.packaging_tag, "Debian")][src.native]
             tag = repo.version_to_tag(format[0], src.upstream_version)
             msg = "%s version %s" % (format[1], src.upstream_version)
 
-            if repo.find_version(options.debian_tag, src.version):
+            if repo.find_version(options.packaging_tag, src.version):
                  gbp.log.warn("Version %s already imported." % src.version)
                  if options.allow_same_version:
                     gbp.log.info("Moving tag of version '%s' since import forced" % src.version)
-                    move_tag_stamp(repo, options.debian_tag, src.version)
+                    move_tag_stamp(repo, options.packaging_tag, src.version)
                  else:
                     raise SkipImport
 
@@ -375,7 +375,7 @@ def main(argv):
                                          author=author,
                                          committer=committer)
 
-                if not (src.native and options.skip_debian_tag):
+                if not (src.native and options.skip_packaging_tag):
                     repo.create_tag(name=tag,
                                     msg=msg,
                                     commit=commit,