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.

diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index f6040e9f7cb18b311281b5899320d0b14fd8bdc2..5d495fadfd14e8da5ad88be74fcdb7298adc4a43 100755 (executable)
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -384,7 +384,7 @@ def parse_args(argv, prefix):
                       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="upstream-tag", dest="upstream_tag")
     orig_group.add_config_file_option(option_name="upstream-tree", dest="upstream_tree")
     orig_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
@@ -544,7 +544,7 @@ def main(argv):
                                    'GBP_BUILD_DIR': build_dir})()
         if options.tag or options.tag_only:
             gbp.log.info("Tagging %s" % cp.version)
-            tag = repo.version_to_tag(options.debian_tag, cp.version)
+            tag = repo.version_to_tag(options.packaging_tag, cp.version)
             if options.retag and repo.has_tag(tag):
                 repo.delete_tag(tag)
             repo.create_tag(name=tag, msg="Debian release %s" % cp.version,

diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 06b3970fd241f95c8ff3c5455c7a4fb5f2b2485f..0621ee7aacacc413036677d7209e9c845b46a646 100755 (executable)
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -269,7 +269,7 @@ def guess_snapshot_commit(cp, repo, options):
     # If the current topmost changelog entry has already been tagged rely on
     # the version information only. The upper level relies then on the version
     # info anyway:
-    if repo.find_version(options.debian_tag, cp.version):
+    if repo.find_version(options.packaging_tag, cp.version):
         return None
     # If we didn't find a snapshot header we look at the point the changelog
     # was last touched.
@@ -359,7 +359,7 @@ def main(argv):
     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",
@@ -437,7 +437,7 @@ def main(argv):
                 else:
                     gbp.log.info("Couldn't find snapshot header, using version info")
             if not since:
-                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 7c72766f07ae84fa615fd06ae04fd890481eee0f..5597f4926801f97f8a66205548cd78cf9207c871 100755 (executable)
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -134,7 +134,7 @@ def apply_debian_patch(repo, unpack_dir, src, options, parents):
                                  other_parents = parents,
                                  author=author,
                                  committer=committer)
-        repo.create_tag(repo.version_to_tag(options.debian_tag, src.version),
+        repo.create_tag(repo.version_to_tag(options.packaging_tag, src.version),
                         msg="Debian release %s" % src.version,
                         commit=commit,
                         sign=options.sign_tags,
@@ -214,7 +214,7 @@ def parse_args(argv):
     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")
 
@@ -287,15 +287,15 @@ def main(argv):
             upstream = UpstreamSource(src.tgz)
             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