#860457 import-orig: Component tarballs not repacked with --filter-pristine-tar

#860457#5
Date:
2017-04-17 08:26:56 UTC
From:
To:
While working on a new upstream version of kicad it's vissible that gbp
is (still) ignoring the filter-pristine-tar option for the commits of
the complementary tarballs into the pristine-tar branch.

Some of the extra tarballs containing e.g some .gitattributes and
.tarvis.yml files in various subdirectories.

...
comp-folder/folder1/.gitattributes
            folder2/.travis.yml
			folder3/.gitattributes
...

gbp is correctly cleaning this out and imports this content to the
upstream branch. There are no such files visible later.

For the main tarball of the source a respective *.gbp.tar.xz is created
and commited to the pristine-tar branch afterwards. But all
complementary stuff isn't repacked into *-comp.gbp.tar.xz archives and
commited to the pristine-tar branch.

...
gbp:debug: Creating pristine tar commit 'libraries' from 'd6f158a258e824cad2ae251683c080142fb7c014'
gbp:debug: /usr/bin/pristine-tar [] ['commit', '../../gitprojects/kicad_4.0.6+dfsg1.orig-libraries.tar.xz', 'd6f158a258e824cad2ae251683c080142fb7c014']
gbp:debug: /usr/bin/pristine-tar [] ['commit', '../kicad_4.0.6+dfsg1.orig.tar.xz', '6d02b04a528d2c304dc38cda695ea405e75b4f79']
...

dpkg-source is notice the difference and shows:
...
dpkg-source: warning: ignoring deletion of file libraries/Housings_SON.pretty/.travis.yml, use --include-removal to override
dpkg-source: warning: ignoring deletion of file libraries/Connectors_USB.pretty/.travis.yml, use --include-removal to override
dpkg-source: warning: ignoring deletion of file libraries/Housings_CSP.pretty/.travis.yml, use --include-removal to override
dpkg-source: warning: ignoring deletion of file libraries/Battery_Holders.pretty/.travis.yml, use --include-removal to override
dpkg-source: warning: ignoring deletion of file doc/.travis.yml, use --include-removal to override
...

So Lintian is later on showing messages like:

...
W: kicad-common: package-contains-vcs-control-file usr/share/kicad/modules/Connectors_USB.pretty/.gitattributes
W: kicad-common: package-contains-vcs-control-file usr/share/kicad/modules/Housings_SON.pretty/.gitattributes
...

Regards
Carsten

#860457#10
Date:
2017-04-17 09:25:21 UTC
From:
To:
Can't parse the "still" above. We never tied to fix this before.

Full filter expression from gbp.conf please.

Full log (as suggested by reportbug) would have been nice. This would
have shown that we never try to repack the component tarballs:


https://github.com/agx/git-buildpackage/blob/master/gbp/scripts/import_orig.py#L577

Just in case somebody wants to spin a patch.
Cheers,
 -- Guido

#860457#15
Date:
2017-04-17 18:06:30 UTC
From:
To:
The relevant part of debian/gbp.conf:

...

This is the full log of the import:

Regards
Carsten

#860457#28
Date:
2021-02-06 14:46:01 UTC
From:
To:
Hello!

Thanks for developing git-buildpackage, I use it all the time.

In MariaDB packaging I use gbp with pristine-tar, and I would like to
use the following conf to get dir of excess upstream files not wanted
in Debian:

But it does not seem to have any effect and I concluded that it is due
to this Bugs#860457.