Bug#962354: pristine-tar: pristine-xz failed to reproduce build of ../libvirt_6.4.0.orig.tar.xz

2020-06-15 Thread Kevin Locke
On Mon, 2020-06-15 at 09:52 -0300, Antonio Terceiro wrote:
> On Sat, Jun 06, 2020 at 05:11:58PM +0200, Andrea Bolognani wrote:
>> Package: pristine-tar
>> Version: 1.47
>> Severity: normal
> [...]
>> Downgrading pristine-tar to 1.46 from buster makes it possible to run
>> gbp import-orig successfully, at which point both 1.46 and 1.47 are
>> able to regenerate the tarball from the git branch.
> [...]
> 
> I bisected this and the commit that introduced this bug was
> 4ff745f2d3e905d88718b5e57bc6b4baf479f55b ("pristine-xz: Detect pixz
> compression").
> 
> Kevin, can you please take a look?

Sure thing.  Thanks Antonio.

Unfortunately, the issue was introduced by me in
https://salsa.debian.org/debian/pristine-tar/-/merge_requests/3
I've created a PR to fix it:
https://salsa.debian.org/debian/pristine-tar/-/merge_requests/5

Sorry for the hassle,
Kevin


signature.asc
Description: PGP signature


Bug#962354: pristine-tar: pristine-xz failed to reproduce build of ../libvirt_6.4.0.orig.tar.xz

2020-06-15 Thread Antonio Terceiro
Control: tag -1 + confirmed

On Sat, Jun 06, 2020 at 05:11:58PM +0200, Andrea Bolognani wrote:
> Package: pristine-tar
> Version: 1.47
> Severity: normal
[...]
> Downgrading pristine-tar to 1.46 from buster makes it possible to run
> gbp import-orig successfully, at which point both 1.46 and 1.47 are
> able to regenerate the tarball from the git branch.
> 
> The Debian repository for libvirt is
> 
>   https://salsa.debian.org/libvirt-team/libvirt/
> 
> and the commits the various branches were pointing to when I
> encountered the issue are
> 
>   pristine-tar9964e57257 pristine-tar data for 
> libvirt_6.2.0.orig.tar.xz
>   upstream/latest 1b6982f1b5 New upstream version 6.2.0
>   debian/experimental 51d88f1e6f Document changes and release 6.2.0-1
> 
> The tarball I was trying to import is
> 
>   https://libvirt.org/sources/libvirt-6.4.0.tar.xz
> 
> but I tried libvirt 6.3.0 as well and got the same results. A couple
> of months ago, when I imported libvirt 6.2.0, and indeed all the many
> times I used gbp import-orig before now, everything worked smoothly.
[...]

I bisected this and the commit that introduced this bug was
4ff745f2d3e905d88718b5e57bc6b4baf479f55b ("pristine-xz: Detect pixz
compression").

Kevin, can you please take a look?


signature.asc
Description: PGP signature


Bug#962354: pristine-tar: pristine-xz failed to reproduce build of ../libvirt_6.4.0.orig.tar.xz

2020-06-06 Thread Andrea Bolognani
Package: pristine-tar
Version: 1.47
Severity: normal

Dear Maintainer,

*** 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 ***

I ran into this issue while trying to import the latest upstream
version for libvirt:

  $ gbp import-orig --verbose --no-rollback --debian-branch debian/experimental 
../libvirt_6.4.0.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/latest']
  gbp:debug: ['git', 'status', '--porcelain']
  gbp:debug: Signature ../libvirt_6.4.0.orig.tar.xz found for 
../libvirt_6.4.0.orig.tar.xz.asc
  What is the upstream version? [6.4.0] 
  gbp:debug: ['git', 'tag', '-l', 'upstream/6.4.0']
  gbp:debug: tar ['-C', '../tmp8pliau55', '-a', '-xf', 
'../libvirt_6.4.0.orig.tar.xz'] []
  gbp:debug: Unpacked '../libvirt_6.4.0.orig.tar.xz' to 
'../tmp8pliau55/libvirt-6.4.0'
  gbp:info: Importing '../libvirt_6.4.0.orig.tar.xz' to branch 
'upstream/latest'...
  gbp:info: Source package is libvirt
  gbp:info: Upstream version is 6.4.0
  gbp:debug: ['git', 'show-ref', '--verify', 'refs/heads/upstream/latest']
  gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream/latest']
  gbp:debug: ['git', 'add', '-f', '.']
  gbp:debug: ['git', 'write-tree']
  gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream/latest']
  gbp:debug: ['git', 'commit-tree', '5d1f17e4035e01548d006d598922650408f56703', 
'-p', '1b6982f1b5d95a81eef1a112d0b1b228d7f910b2']
  gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 6.4.0', 
'refs/heads/upstream/latest', '46f45a63850c420af231a5c4186c5f9187c6b9b4', 
'1b6982f1b5d95a81eef1a112d0b1b228d7f910b2']
  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/latest', '--']
  gbp:debug: ['git', 'mktree', '-z']
  gbp:debug: pristine-tar [] ['--help']
  gbp:debug: pristine-tar [] ['commit', '../libvirt_6.4.0.orig.tar.xz', 
'5d1f17e4035e01548d006d598922650408f56703', '-s', 
'../libvirt_6.4.0.orig.tar.xz.asc']
  gbp:error: Import of ../libvirt_6.4.0.orig.tar.xz failed: Couldn't commit to 
'pristine-tar' with upstream '5d1f17e4035e01548d006d598922650408f56703': 
pristine-xz failed to reproduce build of ../libvirt_6.4.0.orig.tar.xz
  (Please file a bug report.)
  pristine-tar: failed to generate delta
  gbp:debug: rm ['-rf', '../tmp8pliau55'] []

Running pristine-tar again manually, to gather more information:

  $ pristine-tar --verbose --debug commit ../libvirt_6.4.0.orig.tar.xz 
5d1f17e4035e01548d006d598922650408f56703 -s ../libvirt_6.4.0.orig.tar.xz.asc
  pristine-tar: git archive --format=tar 
5d1f17e4035e01548d006d598922650408f56703 | (cd '/tmp/pristine-tar.zknL0MQpcM' 
&& tar x)
  pristine-tar: set subdir to libvirt-6.4.0
  pristine-tar: subdir is libvirt-6.4.0
  pristine-tar: mkdir /tmp/pristine-tar.R46gh49xSl/workdir
  pristine-tar: mv /tmp/pristine-tar.zknL0MQpcM 
/tmp/pristine-tar.R46gh49xSl/workdir/libvirt-6.4.0
  pristine-tar: tar cf /tmp/pristine-tar.R46gh49xSl/recreatetarball --owner 0 
--group 0 --numeric-owner -C /tmp/pristine-tar.R46gh49xSl/workdir 
--no-recursion --mode 0644 --verbatim-files-from --files-from 
/tmp/pristine-tar.R46gh49xSl/manifest
  pristine-tar: pristine-xz -v -d --no-keep gendelta 
../libvirt_6.4.0.orig.tar.xz /tmp/pristine-tar.bXsstH80WF/wrapper
  pristine-xz: pixz -d < ../libvirt_6.4.0.orig.tar.xz > 
/tmp/pristine-tar.ULPnMKQoAx/test
  pristine-xz failed to reproduce build of ../libvirt_6.4.0.orig.tar.xz
  (Please file a bug report.)
  pristine-tar: failed to generate delta

Downgrading pristine-tar to 1.46 from buster makes it possible to run
gbp import-orig successfully, at which point both 1.46 and 1.47 are
able to regenerate the tarball from the git branch.

The Debian repository for libvirt is

  https://salsa.debian.org/libvirt-team/libvirt/

and the commits the various branches were pointing to when I
encountered the issue are

  pristine-tar9964e57257 pristine-tar data for libvirt_6.2.0.orig.tar.xz
  upstream/latest 1b6982f1b5 New upstream version 6.2.0
  debian/experimental 51d88f1e6f Document changes and release 6.2.0-1

The tarball I was trying to import is

  https://libvirt.org/sources/libvirt-6.4.0.tar.xz

but I tried libvirt 6.3.0 as well and got the same results. A couple
of months ago, when I imported libvirt 6.2.0, and indeed all the many
times I used gbp import-orig before now, everything worked smoothly.

In fact, I might