Bug#795797: git-buildpackage: please ignore .pc folders
Le mercredi 19 août 2015 à 17:07 +0200, Guido Günther a écrit : > > On Wed, Aug 19, 2015 at 10:34:56AM +0200, Bernd Zeimetz wrote: > > > > > I get .pc/ but lots of other modifications in the source tree as well > > > (as it's the point of applying patches). If I then unapply: > > > > > > quilt pop -a > > > > > > .pc/ is being removed as well. I remember that not being always the case > > > though in the (long gone) past. > > > > Thats interesting, i think it never happened to me that the .pc folder > > was gone. Do you have any other quilt options being set? Or some > > non-default options in /etc/quilt.quiltrc? > > No configuration on my end. This is quilt 0.63 as in > stable/testing/unstable. > > Is there any content left in .pc ? > > It would actually be nicer to fix this on the quilt side than adding a > workaround to gbp. I’m also affected by this issue. But is quilt really supposed to remove the .pc directory? The quilt(1) manpage says: Files in the .pc directory are automatically removed when they are no longer needed, so there is no need to clean up manually. Note that this mentions only files, and not the directory itself. Moreover, there is bug #496630 opened against quilt that asks for a new command that would precisely delete the .pc folder (and someone suggests to rather add this behaviour to the “pop” command, implying that it is not implemented). Finally, I looked at the source code for the “quilt pop” command and I saw nothing related to removing the .pc directory. So, unless I’m missing something, this issue is not a bug in quilt, and it should thus be fixed in git-buildpackage (unless someone convinces the quilt upstream authors to implement a change in behaviour). -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ https://sebastien.villemot.name ⠈⠳⣄ https://www.debian.org signature.asc Description: This is a digitally signed message part
Bug#795797: git-buildpackage: please ignore .pc folders
hi Guido, sorry for the late reply. > No configuration on my end. This is quilt 0.63 as in > stable/testing/unstable. > > Is there any content left in .pc ? yeah, some hidden files: bzed@think ~ % cd /tmp bzed@think /tmp % mkdir foobar-1 bzed@think /tmp % cd foobar-1 bzed@think /tmp/foobar-1 % mkdir -p debian/patches bzed@think /tmp/foobar-1 % quilt new patch1 Patch patch1 is now on top bzed@think /tmp/foobar-1 % quilt add foo File foo added to patch patch1 bzed@think /tmp/foobar-1 % echo 1 > foo bzed@think /tmp/foobar-1 % quilt refresh Refreshed patch patch1 bzed@think /tmp/foobar-1 % quilt pop -a Removing patch patch1 Removing foo No patches applied bzed@think /tmp/foobar-1 % ls -laR .pc .pc: total 12 drwxr-xr-x 2 bzed bzed 62 Nov 28 13:36 . drwxr-xr-x 4 bzed bzed 29 Nov 28 13:36 .. -rw-r--r-- 1 bzed bzed 15 Nov 28 13:35 .quilt_patches -rw-r--r-- 1 bzed bzed 7 Nov 28 13:35 .quilt_series -rw-r--r-- 1 bzed bzed 2 Nov 28 13:35 .version bzed@think /tmp/foobar-1 % > It would actually be nicer to fix this on the quilt side than adding a > workaround to gbp. Indeed! I think I have a pretty basic quilt config: QUILT_PUSH_ARGS="--color=auto" QUILT_DIFF_ARGS="--no-timestamps --no-index -p ab --color=auto" QUILT_REFRESH_ARGS="--no-timestamps --no-index -p ab" QUILT_DIFF_OPTS='-p' QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33" QUILT_PATCHES=debian/patches So I have no real idea why the .pc folder is still there Cheers, Bernd -- Bernd ZeimetzDebian GNU/Linux Developer http://bzed.dehttp://www.debian.org GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
Bug#795797: git-buildpackage: please ignore .pc folders
Hi, On Wed, Aug 19, 2015 at 10:34:56AM +0200, Bernd Zeimetz wrote: Hi Guido, [...] I get .pc/ but lots of other modifications in the source tree as well (as it's the point of applying patches). If I then unapply: quilt pop -a .pc/ is being removed as well. I remember that not being always the case though in the (long gone) past. Thats interesting, i think it never happened to me that the .pc folder was gone. Do you have any other quilt options being set? Or some non-default options in /etc/quilt.quiltrc? Can you show me how to produce a situation with .pc/ there but no patches applied? bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % rm -rf .pc bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % git status On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % quilt push -a /dev/null quilt pop -a /dev/null echo $? 0 bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % ls -lad .pc drwxr-xr-x 23 bzed bzed 4096 Aug 19 10:32 .pc bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % No configuration on my end. This is quilt 0.63 as in stable/testing/unstable. Is there any content left in .pc ? It would actually be nicer to fix this on the quilt side than adding a workaround to gbp. Cheers, -- Guido
Bug#795797: git-buildpackage: please ignore .pc folders
Hi Bernd, On Sun, Aug 16, 2015 at 06:39:55PM +0200, Bernd Zeimetz wrote: Package: git-buildpackage Version: 0.6.31 Severity: wishlist hi, it would be awesome if gbp * would ignore .pc folders from quilt. Using --git-ignore-new for that all the time is error prone. I looked into this and I wonder when exactly you're seeing a unclean source tree due to _only_ .pc/ being there. If I do a: QUILT_PATCHES=debian/patches/ quilt push -a I get .pc/ but lots of other modifications in the source tree as well (as it's the point of applying patches). If I then unapply: quilt pop -a .pc/ is being removed as well. I remember that not being always the case though in the (long gone) past. Can you show me how to produce a situation with .pc/ there but no patches applied? Cheers, -- Guido
Bug#795797: git-buildpackage: please ignore .pc folders
Hi Guido, [...] I get .pc/ but lots of other modifications in the source tree as well (as it's the point of applying patches). If I then unapply: quilt pop -a .pc/ is being removed as well. I remember that not being always the case though in the (long gone) past. Thats interesting, i think it never happened to me that the .pc folder was gone. Do you have any other quilt options being set? Or some non-default options in /etc/quilt.quiltrc? Can you show me how to produce a situation with .pc/ there but no patches applied? bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % rm -rf .pc bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % git status On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % quilt push -a /dev/null quilt pop -a /dev/null echo $? 0 bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % ls -lad .pc drwxr-xr-x 23 bzed bzed 4096 Aug 19 10:32 .pc bzed@think ..bian/nagios/pkg-nagios-plugins-contrib (git)-[master] % Cheers, Bernd -- Bernd ZeimetzDebian GNU/Linux Developer http://bzed.dehttp://www.debian.org GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
Bug#795797: git-buildpackage: please ignore .pc folders
Package: git-buildpackage Version: 0.6.31 Severity: wishlist hi, it would be awesome if gbp * would ignore .pc folders from quilt. Using --git-ignore-new for that all the time is error prone. thanks, bernd -- Bernd ZeimetzDebian GNU/Linux Developer http://bzed.dehttp://www.debian.org GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
