control: reassign -1 pristine-tar control: affects -1 git-buildpackage Hi Steve, On Mon, Aug 02, 2021 at 08:41:12PM -0500, Steve M. Robbins wrote: > Package: git-buildpackage > Version: 0.9.22 > Severity: normal > File: /usr/lib/python3/dist-packages/gbp/scripts/supercommand.py > > Dear Maintainer, > > I attempted to import a new version into 'experimental' branches using: "gbp > import-orig --pristine-tar --upstream-branch=upstream-experimental > --debian-branch=experimental ~/Downloads/digikam-7.3.0.tar.xz" > > It "failed to reproduce build of ../digikam_7.3.0.orig.tar.xz" > > Run with --verbose: > > 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-experimental'] > gbp:debug: ['git', 'status', '--porcelain'] > What is the upstream version? [7.3.0] > gbp:debug: ['git', 'tag', '-l', 'upstream/7.3.0'] > gbp:debug: tar ['-C', '../tmpbk46rf8d', '-a', '-xf', > '/home/steve/Downloads/digikam-7.3.0.tar.xz'] [] > gbp:debug: Unpacked '/home/steve/Downloads/digikam-7.3.0.tar.xz' to > '../tmpbk46rf8d/digikam-7.3.0' > gbp:info: <DebianUpstreamSource > path='/home/steve/Downloads/digikam-7.3.0.tar.xz' signaturefile=None> > gbp:info: Importing '/home/steve/Downloads/digikam-7.3.0.tar.xz' to branch > 'upstream-experimental'... > gbp:info: Source package is digikam > gbp:info: Upstream version is 7.3.0 > gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/upstream-experimental'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', > 'upstream-experimental'] > gbp:debug: ['git', 'add', '-f', '.'] > gbp:debug: ['git', 'write-tree'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', > 'upstream-experimental'] > gbp:debug: ['git', 'commit-tree', 'f8eadb9d14b1596e9f6ab263a895230a71614291', > '-p', '2090afd33254af7acfdd2fd5e57a77cc270fa584'] > gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 7.3.0', > 'refs/heads/upstream-experimental', > '5f5a4bf691c048b5c7a9b9641b55af38193f2e23', > '2090afd33254af7acfdd2fd5e57a77cc270fa584'] > 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-experimental', '--'] > gbp:debug: ['git', 'mktree', '-z'] > gbp:debug: pristine-tar [] ['commit', '../digikam_7.3.0.orig.tar.xz', > 'f8eadb9d14b1596e9f6ab263a895230a71614291'] > gbp:error: Import of ../digikam_7.3.0.orig.tar.xz failed: Couldn't commit to > 'pristine-tar' with upstream 'f8eadb9d14b1596e9f6ab263a895230a71614291': > pristine-xz failed to reproduce build of ../digikam_7.3.0.orig.tar.xz > (Please file a bug report.)
This is the problem. pristine-tar (which gets invoked by gbp) fails to build a reproducible tarball for digikam_7.3.0.orig.tar.xz so reassigning there. Cheers, -- Guido > pristine-tar: failed to generate delta > gbp:error: Error detected, Will roll back changes. > gbp:info: Rolling back branch upstream-experimental by resetting it to > 2090afd33254af7acfdd2fd5e57a77cc270fa584 > gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of > upstream-experimental', 'refs/heads/upstream-experimental', > '2090afd33254af7acfdd2fd5e57a77cc270fa584'] > gbp:info: Rolling back branch pristine-tar by resetting it to > 0505953bee2887d1fef8d301b0d852773a178ac6 > gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of > pristine-tar', 'refs/heads/pristine-tar', > '0505953bee2887d1fef8d301b0d852773a178ac6'] > gbp:error: Rolled back changes after import error. > gbp:debug: rm ['-rf', '../tmpbk46rf8d'] [] > > > -- System Information: > Debian Release: 11.0 > APT prefers testing > APT policy: (500, 'testing'), (200, 'unstable') > Architecture: amd64 (x86_64) > Foreign Architectures: i386 > > Kernel: Linux 5.10.0-8-amd64 (SMP w/16 CPU threads) > Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, > TAINT_UNSIGNED_MODULE > Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), > LANGUAGE=en_CA:en > Shell: /bin/sh linked to /usr/bin/dash > Init: systemd (via /run/systemd/system) > LSM: AppArmor: enabled > > Versions of packages git-buildpackage depends on: > ii devscripts 2.21.3 > ii git 1:2.30.2-1 > ii man-db 2.9.4-2 > ii python3 3.9.2-3 > ii python3-dateutil 2.8.1-6 > ii python3-pkg-resources 52.0.0-4 > ii sensible-utils 0.0.14 > > Versions of packages git-buildpackage recommends: > ii cowbuilder 0.89 > ii pbuilder 0.231 > ii pristine-tar 1.49 > ii python3-requests 2.25.1+dfsg-2 > ii sbuild 0.81.2 > > Versions of packages git-buildpackage suggests: > ii python3-notify2 0.3-4 > ii sudo 1.9.5p2-3 > ii unzip 6.0-26 > > -- no debconf information >
