Bug#1010205: git-buildpackage: gbp import-orig does not store upstream signature in pristine-tar branch
Tino Mettler
Version: 0.9.25
Severity: normal
I used the following command:
$ gbp import-orig --verbose --debian-branch=debian/unstable --pristine-tar --upstream-signatures=yes --uscan
It does not store the upstream signature in the pristine-tar branch:
$ pristine-tar checkout --s signature rapid-photo-downloader_0.9.33.orig.tar.gz
fatal: path 'rapid-photo-downloader_0.9.33.orig.tar.gz.asc' does not exist in 'refs/heads/pristine-tar'
pristine-tar: git show refs/heads/pristine-tar:rapid-photo-downloader_0.9.33.orig.tar.gz.asc failed
This is the output of the import-orig command. In the pristine-tar command, --signature-file is missing.
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
gbp:debug: ['git', 'rev-parse', '--git-dir']
gbp:debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/']
gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/upstream']
gbp:debug: ['git', 'status', '--porcelain']
gbp:info: Launching uscan...
gpgv: Signatur vom Fr 11 Mär 2022 19:26:52 CET
gpgv: mittels RSA-Schlüssel E26048A9F4A803B91CB1BD648005B1F36970BE28
gpgv: Korrekte Signatur von "Damon Lynch <damon...@gmail.com>"
gpgv: alias "Damon Lynch <damon...@yahoo.com>"
gpgv: alias "Damon Lynch <da...@asianreflection.com>"
gpgv: alias "[invalid image]"
gbp:info: Using uscan downloaded tarball ../rapid-photo-downloader_0.9.33.orig.tar.gz
gbp:debug: Signature ../rapid-photo-downloader_0.9.33.orig.tar.gz found for ../rapid-photo-downloader_0.9.33.orig.tar.gz.asc
What is the upstream version? [0.9.33]
gbp:debug: ['git', 'tag', '-l', 'v0.9.33']
gbp:debug: tar ['-C', '../tmp5kw6qihm', '-a', '-xf', '../rapid-photo-downloader_0.9.33.orig.tar.gz'] []
gbp:debug: Unpacked '../rapid-photo-downloader_0.9.33.orig.tar.gz' to '../tmp5kw6qihm/rapid-photo-downloader-0.9.33'
gbp:info: <DebianUpstreamSource path='../rapid-photo-downloader_0.9.33.orig.tar.gz' signaturefile='../rapid-photo-downloader_0.9.33.orig.tar.gz.asc'>
gbp:info: Importing '../rapid-photo-downloader_0.9.33.orig.tar.gz' to branch 'upstream'...
gbp:info: Source package is rapid-photo-downloader
gbp:info: Upstream version is 0.9.33
gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/upstream']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream']
gbp:debug: ['git', 'add', '-f', '.']
gbp:debug: ['git', 'write-tree']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream']
gbp:debug: ['git', 'commit-tree', 'ff2f5aee0f4ef0258bea6cc2471ea3db545132b3', '-p', '8b0ecdf9b84c65e1869fa995a6f700f3278a5632']
gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 0.9.33', 'refs/heads/upstream', '3eea0aa540a8efda7052e4da78379d6c80adbb8c', '8b0ecdf9b84c65e1869fa995a6f700f3278a5632']
gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/pristine-tar']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'pristine-tar']
gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--']
gbp:debug: ['git', 'mktree', '-z']
gbp:debug: pristine-tar [] ['commit', '../rapid-photo-downloader_0.9.33.orig.tar.gz', 'ff2f5aee0f4ef0258bea6cc2471ea3db545132b3']
gbp:debug: ['git', 'tag', '-m', 'Upstream version 0.9.33', 'v0.9.33', '3eea0aa540a8efda7052e4da78379d6c80adbb8c']
gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/debian/unstable']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'debian/unstable']
gbp:debug: ['git', 'show', '--pretty=medium', 'debian/unstable:debian/source/format']
gbp:debug: 3.0 (quilt) package, replacing debian/ dir
gbp:info: Replacing upstream source on 'debian/unstable'
gbp:debug: ['git', 'ls-tree', '-z', 'v0.9.33^{tree}', '--']
gbp:debug: ['git', 'ls-tree', '-z', 'debian/unstable^{tree}', '--']
gbp:debug: Using c1c913a77a1d3f17747c01611a0c29b2fd583feb as debian/ tree
gbp:debug: ['git', 'mktree', '-z']
gbp:debug: ['git', 'commit-tree', '82dc2eabc21969b30c37d96b6779501d99aa6811', '-p', 'debian/unstable^{commit}', '-p', 'v0.9.33^{commit}']
gbp:debug: ['git', 'update-ref', '-m', 'gbp: Updating debian/unstable after import of v0.9.33', 'refs/heads/debian/unstable', 'ea3e5a0a062251588aea7fce95ce90607536b8e1']
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/debian/unstable']
gbp:debug: ['git', 'reset', '--quiet', '--hard', 'ea3e5a0a062251588aea7fce95ce90607536b8e1', '--']
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/debian/unstable']
gbp:debug: rm ['-rf', '../tmp5kw6qihm'] []
gbp:info: Successfully imported version 0.9.33 of ../rapid-photo-downloader_0.9.33.orig.tar.gz
*** Reporter, please consider answering these questions, where appropriate ***
* What led up to the situation?
* What exactly did you do (or not do) that was effective (or
ineffective)?
* What was the outcome of this action?
* What outcome did you expect instead?
*** End of the template - remove these template lines ***
-- System Information:
Debian Release: bookworm/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.17.2 (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_UNSIGNED_MODULE
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.22.1
ii git 1:2.35.2-1
ii man-db 2.10.2-1
ii python3 3.10.4-1
ii python3-dateutil 2.8.1-6
ii python3-pkg-resources 59.6.0-1.2
ii sensible-utils 0.0.17
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.89
ii pbuilder 0.231
ii pristine-tar 1.49
ii python3-requests 2.27.1+dfsg-1
Versions of packages git-buildpackage suggests:
pn python3-notify2 <none>
ii sudo 1.9.10-3
ii unzip 6.0-26
-- debconf-show failed
Tino Mettler
I put a debug print into pkg/pristinetar.py. It looks like the commit
function is not invoked with a signaturefile argument.
Regards,
Tino