Hi Ian, On Sat, Feb 04, 2023 at 05:31:11PM +0000, Ian Jackson wrote: > Package: git-buildpackage > Version: 0.9.30 > Severity: normal > File: /usr/lib/python3/dist-packages/gbp/scripts/supercommand.py > > Steps to reproduce: > > dget > https://deb.debian.org/debian/pool/main/p/python-coverage/python-coverage_6.5.0+dfsg1-2.dsc > dpkg-source --skip-patches -x python-coverage_6.5.0+dfsg1-2.dsc > cd python-coverage-6.5.0+dfsg1/ > git init > git add -Af . > git commit -m import > # Now we are on a patches-unapplied packaging branch (without .pc > # directory, at least in the version of dpkg-source I have here) > gbp pq import > > Expected behaviour: > > Imports the patch queue, leaving me on patch-queue/master, > with two patches applied. > > Actual behaviour: > > Python stack backtrace. (Transcript below.) > > It leaves me on a broken patch-queue/master branch - one without > the patches applied. Even to go back to where I was before,
I've fixed that to go to an unbroken state on all exceptions (not only the ones raised by gbp itself). > I must > git checkout master; git-branch -D patch-queue/master Or to recover with gbp iself: "gbp pq switch && gbp pq drop" > The root cause is that the debian/patches/series file contains a line > containing only a form feed (ctrl-L). I think this is deranged. > Perhaps you don't want to support it. Maybe you want to at least > detect and reject it > > Empirically, deleting the form feed works around the problem. gbp does the same now. Thanks for investigating! Cheers, -- Guido
