Hi, On Wed, Aug 12, 2020 at 07:31:43PM +0200, Christian Göttsche wrote: > Package: git-buildpackage > Version: 0.9.20 > > While importing a new version of Dovecot (with its component > pigeonhole) I noticed that gbp does not import the signature file of > the component: > > > dovecot $ gbp import-orig --verbose --uscan > 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: Signature made Wed 12 Aug 2020 14:40:44 CEST > gpgv: using RSA key 2BE74AAB3EE754DFB9C80D3318A348AEED409DA1 > gpgv: issuer "[email protected]" > gpgv: Good signature from "Dovecot Community Edition <[email protected]>" > gpgv: Signature made Wed 12 Aug 2020 14:41:11 CEST > gpgv: using RSA key 2BE74AAB3EE754DFB9C80D3318A348AEED409DA1 > gpgv: issuer "[email protected]" > gpgv: Good signature from "Dovecot Community Edition <[email protected]>" > uupdate: debian/source/format is "3.0 (quilt)". > uupdate: Auto-generating dovecot_2.3.10.1+dfsg1-2.debian.tar.xz > uupdate: -> Copy to dovecot_2.3.11.3-1.debian.tar.xz > gbp:info: Using uscan downloaded tarball ../dovecot_2.3.11.3.orig.tar.gz > gbp:debug: Signature ../dovecot_2.3.11.3.orig.tar.gz found for > ../dovecot_2.3.11.3.orig.tar.gz.asc > What is the upstream version? [2.3.11.3] > gbp:debug: ['git', 'tag', '-l', 'upstream/2.3.11.3'] > gbp:debug: tar ['-C', '../tmp5mozwa8k', '-a', '-xf', > '../dovecot_2.3.11.3.orig.tar.gz'] [] > gbp:debug: Unpacked '../dovecot_2.3.11.3.orig.tar.gz' to > '../tmp5mozwa8k/dovecot-2.3.11.3' > gbp:debug: tar ['-C', > '/home/christian/Downloads/test/tmp5mozwa8k/tmptnesyvj6', '-a', '-xf', > '../dovecot_2.3.11.3.orig-pigeonhole.tar.gz'] [] > gbp:debug: rm ['-rf', > '/home/christian/Downloads/test/tmp5mozwa8k/tmptnesyvj6'] [] > gbp:info: <DebianUpstreamSource path='../dovecot_2.3.11.3.orig.tar.gz' > signaturefile='../dovecot_2.3.11.3.orig.tar.gz.asc'> > gbp:info: <DebianAdditionalTarball > path='../dovecot_2.3.11.3.orig-pigeonhole.tar.gz' signaturefile=None> > gbp:info: Importing '../dovecot_2.3.11.3.orig.tar.gz' to branch 'upstream'... > gbp:info: Source package is dovecot > gbp:info: Upstream version is 2.3.11.3 > 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', > '19c85d604581301c2f866e71059cd400f30b175f', '-p', > '680e65782e2a42bcf02b404159ceb475b335023a'] > gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version > 2.3.11.3', 'refs/heads/upstream', > '5cb258901876f1d0023bd227ac08475601088b77', > '680e65782e2a42bcf02b404159ceb475b335023a'] > 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: ['git', 'ls-tree', '-z', 'upstream', '--'] > gbp:debug: Creating pristine tar commit > '../dovecot_2.3.11.3.orig-pigeonhole.tar.gz' from > 'caf0848265034f70e01c8dc371eb6a00731a098d' > gbp:debug: pristine-tar [] ['commit', > '../dovecot_2.3.11.3.orig-pigeonhole.tar.gz', > 'caf0848265034f70e01c8dc371eb6a00731a098d'] > gbp:debug: pristine-tar [] ['--help'] > gbp:debug: pristine-tar [] ['commit', > '../dovecot_2.3.11.3.orig.tar.gz', > '5a563606f3a5f11a5d50b0200d1b20069589065d', '-s', > '../dovecot_2.3.11.3.orig.tar.gz.asc'] > gbp:debug: ['git', 'tag', '-m', 'Upstream version 2.3.11.3', '-s', > 'upstream/2.3.11.3', '5cb258901876f1d0023bd227ac08475601088b77'] > gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/master'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'master'] > gbp:debug: ['git', 'show', '--pretty=medium', 'master:debian/source/format'] > gbp:debug: 3.0 (quilt) package, replacing debian/ dir > gbp:info: Replacing upstream source on 'master' > gbp:debug: ['git', 'ls-tree', '-z', 'upstream/2.3.11.3^{tree}', '--'] > gbp:debug: ['git', 'ls-tree', '-z', 'master^{tree}', '--'] > gbp:debug: Using 77532f57e74ffd49cf17fa1e721b5573577e1223 as debian/ tree > gbp:debug: ['git', 'mktree', '-z'] > gbp:debug: ['git', 'commit-tree', > '6471a6fd2abda08f26fb505ee3cf91681e0f3e7d', '-p', 'master^{commit}', > '-p', 'upstream/2.3.11.3^{commit}'] > gbp:debug: ['git', 'update-ref', '-m', 'gbp: Updating master after > import of upstream/2.3.11.3', 'refs/heads/master', > 'cdd7b2c38ea20c27ad07bed57098f105ed8e0384'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/pigeonhole'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/pigeonhole'] > gbp:debug: rm ['-rf', '../tmp5mozwa8k'] [] > gbp:info: Successfully imported version 2.3.11.3 of > ../dovecot_2.3.11.3.orig.tar.gz > > > The parent directory after the import looks like: > > > ls -la .. > total 11M > drwxr-x--- 4 christian christian 4.0K Aug 12 18:51 . > drwxr-x---. 4 christian christian 4.0K Aug 12 18:37 .. > drwxr-x--- 8 christian christian 12K Aug 12 18:51 dovecot > -rw-r----- 1 christian christian 61K Aug 12 18:50 > dovecot_2.3.10.1+dfsg1-2.debian.tar.xz > drwxr-x--- 7 christian christian 4.0K Aug 12 18:50 dovecot-2.3.11.3 > -rw-r----- 1 christian christian 1.6M Aug 12 18:50 > dovecot_2.3.11.3.orig-pigeonhole.tar.gz > lrwxrwxrwx 1 christian christian 23 Aug 12 18:50 > dovecot_2.3.11.3.orig.tar.gz -> dovecot-2.3.11.3.tar.gz > lrwxrwxrwx 1 christian christian 27 Aug 12 18:50 > dovecot_2.3.11.3.orig.tar.gz.asc -> dovecot-2.3.11.3.tar.gz.sig > -rw-r----- 1 christian christian 7.1M Aug 12 18:50 dovecot-2.3.11.3.tar.gz > -rw-r----- 1 christian christian 866 Aug 12 18:50 > dovecot-2.3.11.3.tar.gz.sig > -rw-r----- 1 christian christian 1.9M Aug 12 18:50 > dovecot-2.3.11-pigeonhole-0.5.11.tar.gz > -rw-r----- 1 christian christian 866 Aug 12 18:50 > dovecot-2.3.11-pigeonhole-0.5.11.tar.gz.sig > > > I think gbp looks for component name + '.asc' > (/usr/lib/python3/dist-packages/gbpscripts/common/__init__.py:69) but > dovecot_2.3.11.3.orig-pigeonhole.tar.gz does not exist and no symlink > 'dovecot_2.3.11.3.orig-pigeonhole.tar.gz.sig' -> > 'dovecot-2.3.11-pigeonhole-0.5.11.tar.gz.sig' was created.
That would be uscan's job. You can verify this by adding the symlinks and importing. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963968 Cheers, -- Guido
