On 03/02/2014 12:38 AM, gregor herrmann wrote: > On Sat, 01 Mar 2014 23:37:22 +0100, Ross Gammon wrote: > >> 'gbp >> buildpackage' fails because it detects altered files in the source code. > >> Or can I override >> gbp buildpackage (with pbuilder as an option) in some way so that it >> ignores the fact that there are altered files? > > Yes, you can: > > == excerpt from ~/.gbp.conf == > > [buildpackage] > ... > export = WC > > > Ah, here it is in the manpage: > > --git-export=treeish > Instead of exporting the current branch head, export the > treeish object treeish. The special name INDEX exports the > current index whereas the special name WC exports the > current working copy as is. > > > Cheers, > gregor > Thanks Gregor, but I was already aware of --git-export=WC & --git-ignore-new. I have used this when I wanted to test changes to e.g. d/rules before committing the fix. What I was probably not clear about, was that I meant changes made outside the debian directory. For example, make a simple change to a working package by adding "#Ross is a berk" to setup.py. gbp buildpackage with the pbuilder option and --git-export & --git-ignore-new still fails:
dpkg-source: info: building gramps using existing ./gramps_4.0.3+dfsg.orig.tar.gz dpkg-source: info: local changes detected, the modified files are: gramps-4.0.3+dfsg/setup.py dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/gramps_4.0.3+dfsg-3.diff.8Ha2F5 dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -b gramps-4.0.3+dfsg gave error exit status 2 gbp:error: Couldn't run 'git-pbuilder': git-pbuilder returned 2 But anyway, studying this error a bit harder with a clear head in the morning, and then studying the man page for dpkg-source, I solved it. Adding the option -i.* to gbp successfully got passed to dpkg-source, and it built. Cheers, Ross PS: now I had better remove that change before I forget ;-) -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/5312dfde.3060...@the-gammons.net
