Hi, On Tue, Apr 07, 2020 at 06:32:00AM -0400, Reinhard Tartler wrote: > Package: git-buildpackage > Version: 0.9.17 > Severity: normal > > I'm actually using this from a salsa CI/CD pipeline, the most recent job can > be seen at > https://salsa.debian.org/debian/aspectc/-/jobs/649590 > > Relevant part: > > + gbp buildpackage -uc -us --git-pristine-tar --git-debian-branch=master > gbp:info: Creating /builds/debian/aspectc++_2.2+git20200405.orig.tar.bz2 > Traceback (most recent call last): > File "/usr/bin/gbp", line 149, in <module> > sys.exit(supercommand()) > File "/usr/bin/gbp", line 145, in supercommand > return module.main(args) > File "/usr/lib/python3/dist-packages/gbp/scripts/buildpackage.py", line > 536, in main > prepare_upstream_tarballs(repo, source, options, tarball_dir, > File "/usr/lib/python3/dist-packages/gbp/scripts/export_orig.py", line 71, > in prepare_upstream_tarballs > if not pristine_tar_build_origs(repo, source, output_dir, options): > File "/usr/lib/python3/dist-packages/gbp/scripts/export_orig.py", line > 114, in pristine_tar_build_origs > repo.create_upstream_tarball_via_pristine_tar(source, > File "/usr/lib/python3/dist-packages/gbp/deb/git.py", line 322, in > create_upstream_tarball_via_pristine_tar > commit, found_signature = self.get_pristine_tar_commit(source, component) > File "/usr/lib/python3/dist-packages/gbp/deb/git.py", line 315, in > get_pristine_tar_commit > return self.pristine_tar.get_commit('%s_%s.orig%s.tar.*' % > (source.sourcepkg, > File "/usr/lib/python3/dist-packages/gbp/pkg/pristinetar.py", line 96, in > get_commit > return commit, self._commit_contains_file(commit, '%s.asc' % > archive_regexp) > File "/usr/lib/python3/dist-packages/gbp/pkg/pristinetar.py", line 71, in > _commit_contains_file > cregex = re.compile(regexp) > File "/usr/lib/python3.8/re.py", line 250, in compile > return _compile(pattern, flags) > File "/usr/lib/python3.8/re.py", line 302, in _compile > p = sre_compile.compile(pattern, flags) > File "/usr/lib/python3.8/sre_compile.py", line 764, in compile > p = sre_parse.parse(p, flags) > File "/usr/lib/python3.8/sre_parse.py", line 948, in parse > p = _parse_sub(source, state, flags & SRE_FLAG_VERBOSE, 0) > File "/usr/lib/python3.8/sre_parse.py", line 443, in _parse_sub > itemsappend(_parse(source, state, verbose, nested + 1, > File "/usr/lib/python3.8/sre_parse.py", line 671, in _parse > raise source.error("multiple repeat", > re.error: multiple repeat at position 8 > > The pristine-tar branch looks like this: > > siretart@x1:~/packages/aspectc++/aspectc++$ git remote -vv > salsa g...@salsa.debian.org:debian/aspectc (fetch) > salsa g...@salsa.debian.org:debian/aspectc (push) > > siretart@x1:~/packages/aspectc++/aspectc++$ git ls-tree -l salsa/pristine-tar > 100644 blob e0ef5a283035c143cae504e32d33b7db974cd5c4 131724 > aspectc++-1.2+svn20150823.orig.tar.gz.delta > 100644 blob 70ae6fb2a3de661b5cee42441c76a3d6764c78a5 41 > aspectc++-1.2+svn20150823.orig.tar.gz.id > 100644 blob a8645c2db722a39d32876da3cade5a7b34979b92 48823 > aspectc++_2.0+svn20160329.orig.tar.bz2.delta > 100644 blob b3f3291d8febf8c2f59db6f3a3e0b5dfcec6ae33 41 > aspectc++_2.0+svn20160329.orig.tar.bz2.id > 100644 blob 5b21a0bcb2ecc7d18ea3356a48373e7d09c907ad 88406 > aspectc++_2.1.orig.tar.gz.delta > 100644 blob b12723e6b4569e3b4a8b8bee24a84f580affaed1 41 > aspectc++_2.1.orig.tar.gz.id > 100644 blob bd04cca0af2fe9a17184d22bfc9c4f5046ee6b8a 46585 > aspectc++_2.2+git20200405.orig.tar.bz2.delta > 100644 blob ab7dd0b60d77717dd942ab526f82a1e00c5e4568 41 > aspectc++_2.2+git20200405.orig.tar.bz2.id > > > Is it possible that the 'multiple repeat' exception has something to do with > the two '+' in the package name?
Yes, python wants that escaped but (the also used) git-log does not. Fix is at https://git.sigxcpu.org/cgit/git-buildpackage/commit/?id=74b37991deb075b948a9ce1e1a9d1fd03091c59e Cheers, -- Guido > > > -- System Information: > Debian Release: bullseye/sid > APT prefers testing > APT policy: (500, 'testing'), (50, 'unstable') > Architecture: amd64 (x86_64) > > Kernel: Linux 5.4.0-4-amd64 (SMP w/4 CPU cores) > Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), > LANGUAGE=en_US.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > Init: systemd (via /run/systemd/system) > LSM: AppArmor: enabled > > Versions of packages git-buildpackage depends on: > ii devscripts 2.20.2 > ii git 1:2.25.1-1 > ii man-db 2.9.0-2 > ii python3 3.8.2-2 > ii python3-dateutil 2.7.3-3 > ii python3-pkg-resources 44.0.0-1 > ii sensible-utils 0.0.12+nmu1 > > Versions of packages git-buildpackage recommends: > pn cowbuilder | pbuilder | sbuild <none> > pn pristine-tar <none> > ii python3-requests 2.22.0-2 > > Versions of packages git-buildpackage suggests: > pn python3-notify2 <none> > ii sudo 1.8.31-1 > ii unzip 6.0-25 > > -- no debconf information >
