Hi, On Mon, Jun 29, 2020 at 11:17:51PM +1000, Hugh McMaster wrote: > On Mon, 29 Jun 2020 at 22:47, Guido Günther wrote: > > ahh...i see you're using component tarballs - that's likely the problem. > > Could you add > > > > > > https://github.com/agx/git-buildpackage/commit/3dc0bf3a8acfccdafa82b91bcc89ca2c82b46a1f > > > > so we get an idea what signature file gbp is looking for? > > That commit causes a fatal error: AttributeError: > 'DebianUpstreamSource' object has no attribute 'signature'. > > Did you mean "source.signaturefile"? If so, then it didn't help, > sadly. The output is None.
It's always `None` since there's a check right above which i missed in a hurry yesterday, sorry for the confusion. > > Thank you for your help so far. There's two issues: - gbp did not properly check for the existence of component signatures, that is fixed on master: - Even then the signatures weren't named in a way gbp would find them. When naming them like $ ls -1 *.asc freetype_2.10.2.orig-ft2demos.tar.xz.asc freetype_2.10.2.orig-ft2docs.tar.xz.asc freetype_2.10.2.orig.tar.xz.asc (they were originally named freetype-2.10.2-doc.tar.xz.sig and freetype-2.10.2-ft2demos.tar.xz.sig so gbp has a hard time finding those since not only the extension is different but also the tarball name - i think that's a bug in your watch file.) After renaming the import works for me. Cheers, -- Guido > hugh@debian:~/freetype2/freetype2$ gbp import-orig --pristine-tar > --upstream-signatures=on --component=ft2docs --component=ft2demos --verbose > ../freetype_2.10.2.orig.tar.xz > 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:debug: Signature ../freetype_2.10.2.orig.tar.xz found for > ../freetype_2.10.2.orig.tar.xz.asc > What is the upstream version? [2.10.2] > gbp:debug: ['git', 'tag', '-l', 'upstream/2.10.2'] > gbp:debug: tar ['-C', '../tmpdialu_cj', '-a', '-xf', > '../freetype_2.10.2.orig.tar.xz'] [] > gbp:debug: Unpacked '../freetype_2.10.2.orig.tar.xz' to > '../tmpdialu_cj/freetype-2.10.2' > gbp:debug: tar ['-C', '/home/hugh/freetype2/tmpdialu_cj/tmphb0tm39o', '-a', > '-xf', '../freetype_2.10.2.orig-ft2docs.tar.xz'] [] > gbp:debug: rm ['-rf', '/home/hugh/freetype2/tmpdialu_cj/tmphb0tm39o'] [] > gbp:debug: tar ['-C', '/home/hugh/freetype2/tmpdialu_cj/tmppdl4wj42', '-a', > '-xf', '../freetype_2.10.2.orig-ft2demos.tar.xz'] [] > gbp:debug: rm ['-rf', '/home/hugh/freetype2/tmpdialu_cj/tmppdl4wj42'] [] > gbp:info: Importing '../freetype_2.10.2.orig.tar.xz' to branch 'upstream'... > gbp:info: Source package is freetype > gbp:info: Upstream version is 2.10.2 > 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', '069f35939ae25e85311a2c5546ca30c9a02d6a5b', > '-p', 'cf4194e0a9d0a0e96c158b2764dcfbcc26c3a098'] > gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 2.10.2', > 'refs/heads/upstream', '2e1a71235f8928f5ed90bb76b3fc4e270fe232cd', > 'cf4194e0a9d0a0e96c158b2764dcfbcc26c3a098'] > gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/pristine-tar'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'pristine-tar'] > gbp:error: ../freetype_2.10.2.orig-ft2docs.tar.xz does not have a signature > file None > gbp:error: Error detected, Will roll back changes. > gbp:info: Rolling back branch upstream by resetting it to > cf4194e0a9d0a0e96c158b2764dcfbcc26c3a098 > gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of > upstream', 'refs/heads/upstream', 'cf4194e0a9d0a0e96c158b2764dcfbcc26c3a098'] > gbp:info: Rolling back branch pristine-tar by resetting it to > b6f09b8023d1ba38f881befb5daf94a6572e9831 > gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of > pristine-tar', 'refs/heads/pristine-tar', > 'b6f09b8023d1ba38f881befb5daf94a6572e9831'] > gbp:error: Rolled back changes after import error. > gbp:debug: rm ['-rf', '../tmpdialu_cj'] [] >
