Make distribution prefix configurable

For Apertis for packages derived from Debian we tag the version as imported form debian with debian/version. While the apertis derivative are tagged apertis/version.

Add an option to set the distribution to base the version on to cope with this situation.

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

deb-git-version-gen

@@ -65,7 +65,8 @@ class Versioner:
             dch=False,
             debug=False,
             release=True,               # type: typing.Optional[bool]
-            upstream=True
+            upstream=True,
+            distro=None
     ):
         # type: (...) -> None
         self.branch_marker = branch_marker
@@ -74,6 +75,7 @@ class Versioner:
         self.debug = debug
         self.release = release
         self.upstream = upstream
+        self.distro = distro
 
     def parse_description(self, description):
         # type: (str) -> typing.Tuple[str, Version, int, str]
@@ -245,9 +247,10 @@ class Versioner:
                 mangled_version = tagged_version.replace(':', '%')
                 mangled_version = mangled_version.replace('~', '_')
                 try:
+                    prefix = self.distro if self.distro else '*'
                     raw_description = check_output([
                         'git', 'describe', '--tags',
-                        '--match=*/' + mangled_version,
+                        '--match=' + prefix + '/' + mangled_version,
                         '--long',
                     ], universal_newlines=True, stderr=diag_sink).strip()
                 except subprocess.CalledProcessError:
@@ -481,6 +484,10 @@ def main():
         help='run debchange to update debian/changelog',
         action='store_true', default=False)
 
+    parser.add_argument(
+        '--distro', help='distribution prefix',
+        default=None)
+
     parser.add_argument(
         '--counter-based',
         help='base version numbers on commit count (default)',
@@ -516,6 +523,7 @@ def main():
             debug=args.debug,
             release=args.release,
             upstream=args.upstream,
+            distro=args.distro
         ).main()
     except (Failure, subprocess.CalledProcessError) as e:
         if args.debug: