On 11/28/24 5:29 PM, Pirate Praveen wrote:


On 11/28/24 5:22 PM, Paul Gevers wrote:
Hi,

On 11/28/24 10:56, Pirate Praveen wrote:
pristine-tar almost always fail when there are multiple orig tar files. I did not report bugs since the limitation of not working 100% is a known issue already.

I'm surprised to hear this. src:cacti is using multiple orig tar files (2) for several years now and I've been using pristine-tar (via gbp) to store them.

Do you import them using gbp import-orig --pristine-tar as well? or just pristine-tar commit?

Paul

https://salsa.debian.org/debian/cacti/-/tree/pristine-tar?ref_type=heads



This can now be reproduced with node-cacache

pravi@mahishi2:/tmp$ gbp clone --pristine-tar g...@salsa.debian.org:js-team/node-cacache.git
gbp:info: Cloning from 'g...@salsa.debian.org:js-team/node-cacache.git'
pravi@mahishi2:/tmp$ cd node-cacache/
pravi@mahishi2:/tmp/node-cacache$ less debian/gbp.conf
pravi@mahishi2:/tmp/node-cacache$ origtargz
pristine-tar: successfully generated ../node-cacache_17.0.3+~cs10.3.7.orig-npmcli-move-file.tar.gz pristine-tar: successfully generated ../node-cacache_17.0.3+~cs10.3.7.orig-npmcli-fs.tar.gz pristine-tar: successfully generated ../node-cacache_17.0.3+~cs10.3.7.orig-infer-owner.tar.gz pristine-tar: successfully generated ../node-cacache_17.0.3+~cs10.3.7.orig-gar-promisify.tar.gz pristine-tar: successfully generated ../node-cacache_17.0.3+~cs10.3.7.orig-fs-minipass.tar.gz fatal: ambiguous argument '60b4383b8c982ac64553f2754abaefe7ca7ebf79^{tree}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
fatal: not a valid object name: 60b4383b8c982ac64553f2754abaefe7ca7ebf79^{tree}
tar: This does not look like a tar archive
tar: Exiting with failure status due to previous errors
pristine-tar: command failed: git archive --format=tar 60b4383b8c982ac64553f2754abaefe7ca7ebf79\^\{tree\} | (cd '/tmp/pristine-tar.nbS9WwWNUi' && tar x)

debian/gbp.conf which defines the extra orig tars,

[DEFAULT]
component=['fs-minipass', 'infer-owner', 'npmcli-move-file', 'npmcli-fs', 'gar-promisify']

[import-orig]
filter=.gitignore

Then this is imported with gbp import-orig --pristine-tar

Same works with

pravi@mahishi2:/tmp/node-cacache$ gbp export-orig --pristine-tar
gbp:info: Creating /tmp/node-cacache_17.0.3+~cs10.3.7.orig.tar.gz
gbp:info: Creating /tmp/node-cacache_17.0.3+~cs10.3.7.orig-fs-minipass.tar.gz gbp:info: Creating /tmp/node-cacache_17.0.3+~cs10.3.7.orig-infer-owner.tar.gz gbp:info: Creating /tmp/node-cacache_17.0.3+~cs10.3.7.orig-npmcli-move-file.tar.gz
gbp:info: Creating /tmp/node-cacache_17.0.3+~cs10.3.7.orig-npmcli-fs.tar.gz
gbp:info: Creating /tmp/node-cacache_17.0.3+~cs10.3.7.orig-gar-promisify.tar.gz

Reply via email to