git build recipe seems not to like multiple - in version

[Scott Moser]

As seen at
 https://launchpadlibrarian.net/277898914/buildlog.txt.gz

I hit an error when trying to use debupstream when the upstream version in debian/changelog had '-' in it.

Ie, my upstream version was
 0.7.7~git1029-gb56d7a1-0ubuntu1

And I think that caused the error.

Git version:
git version 1.9.1
git-build-recipe 0.3~git201603101733.90b6821~ubuntu14.04.2
Building recipe:
# git-build-recipe format 0.4 deb-version {debupstream:ubuntu-pkg}-{debversion}+trunk
lp:cloud-init master
merge ubuntu-pkg lp:cloud-init ubuntu/devel

RUN ['git-build-recipe', '--safe', '--no-build', '--manifest', '/home/buildd/build-RECIPEBRANCHBUILD-1196039/chroot-autobuild/home/buildd/work/tree/manifest', '--distribution', 'yakkety', '--allow-fallback-to-native', '--append-version', '~ubuntu16.10.1', '/home/buildd/build-RECIPEBRANCHBUILD-1196039/chroot-autobuild/home/buildd/work/recipe', '/home/buildd/build-RECIPEBRANCHBUILD-1196039/chroot-autobuild/home/buildd/work/tree']
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gitbuildrecipe/deb_util.py", line 155, in add_autobuild_changelog_entry
    changelog.Version(version)
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 213, in __init__
    super(AptPkgVersion, self).__init__(version)
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 111, in __init__
    self.full_version = version
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 137, in __setattr__
    self._set_full_version(str(value))
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 116, in _set_full_version
    raise ValueError("Invalid version string %r" % version)
ValueError: Invalid version string '{debupstream:ubuntu-pkg}-0.7.7~git1029-gb56d7a1-0ubuntu1+trunk~ubuntu16.10.1'

During handling of the above exception, another exception occurred:

[Colin Watson (cjwatson)]

This has nothing to do with multiple "-" characters. The problem is that {debupstream:ubuntu-pkg} hasn't been expanded for some reason.

[Andreas Hasenack (ahasenack)]

I just got what looks like a similar issue.

In https://launchpadlibrarian.net/667446096/buildlog.txt.gz:
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gitbuildrecipe/deb_util.py", line 155, in add_autobuild_changelog_entry
    changelog.Version(version)
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 250, in __init__
    super(AptPkgVersion, self).__init__(version)
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 133, in __init__
    self.full_version = version
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 162, in __setattr__
    self._set_full_version(str(value))
  File "/usr/lib/python3/dist-packages/debian/debian_support.py", line 139, in _set_full_version
    raise ValueError("Invalid version string %r" % version)
ValueError: Invalid version string '{debversion:ccache}~202305221913~ubuntu22.04.1'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/bin/git-build-recipe", line 11, in <module>
    load_entry_point('git-build-recipe==0.1', 'console_scripts', 'git-build-recipe')()
  File "/usr/lib/python3/dist-packages/gitbuildrecipe/main.py", line 144, in main
    add_autobuild_changelog_entry(
  File "/usr/lib/python3/dist-packages/gitbuildrecipe/deb_util.py", line 157, in add_autobuild_changelog_entry
    raise Exception("Invalid deb-version: %s: %s" % (version, e))
Exception: Invalid deb-version: {debversion:ccache}~202305221913~ubuntu22.04.1: Invalid version string '{debversion:ccache}~202305221913~ubuntu22.04.1'

The recipe was:

# git-build-recipe format 0.4 deb-version {debversion:ccache}~{time}
lp:ubuntu/+source/openssh ubuntu/jammy-devel
merge ccache lp:~ahasenack/ubuntu/+source/openssh openssh-split-unique-gssapi