Re: [git-buildpackage] debian-branch vs. git-debian-branch
On Thu 2016-01-21 01:10:52 -0500, Guido Günther wrote: > The config file variables are always called debian-branch and > upstream-branch. We only have the --git-* prefix on the commandline of > "gbp buildpackge" to distinguish our options from options passed to the > builder (this was inspired by svn-buildpackage back then). ok, that makes sense (it would be nice if it was clearly documented someplace -- i didn't find this pattern described in the manpages i was reading, but maybe i didn't look in the right place) > So if > > [DEFAULT] > debian-branch = > > does not work this would be a bug. I don't see this here though. I think this is the case, alas. I'm seeing: 0 dkg@alice:~/src/libreswan/libreswan$ cat debian/gbp.conf [ DEFAULT ] pristine-tar = True upstream-branch = master upstream-vcs-tag = v%(version)s debian-branch=debian 0 dkg@alice:~/src/libreswan/libreswan$ gbp buildpackage -uc -us gbp:error: You are not on branch 'master' but on 'debian' gbp:error: Use --git-ignore-branch to ignore or --git-debian-branch to set the branch name. 1 dkg@alice:~/src/libreswan/libreswan$ gbp buildpackage --help | grep -A2 -e --git-debian-branch --git-debian-branch=DEBIAN_BRANCH Branch the Debian package is being developed on, default is 'master' 0 dkg@alice:~/src/libreswan/libreswan$ cd 0 dkg@alice:~$ gbp config buildpackage.debian-branch buildpackage.debian-branch=master 0 dkg@alice:~$ But "gbp buildpackage -uc -us --git-debian-branch=debian" works fine :/ > The code did not change recently so I really wonder what could trigger > this on your end? Are you overriding branch names in a > > [buildpackage] > > section as well? no, i have no such section in any of the gbp.conf's that i'm aware of. so i'm still puzzled. Thanks for looking into it though. anything else i should do to try to debug? This used to work for me. :/ --dkg ___ git-buildpackage mailing list git-buildpackage@lists.sigxcpu.org http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
Re: [git-buildpackage] debian-branch vs. git-debian-branch
Hi Daniel, On Wed, Jan 20, 2016 at 05:38:48PM -0500, Daniel Kahn Gillmor wrote: > hi gbp'ers-- > > i used to use DEFAULT.debian-branch in gbp.conf when the debian > packaging is on a branch not named "master". But recently that appears > to not work, and i need to use DEFAULT.git-debian-branch instead. > > however the default /etc/git-buildpackage/gbp.conf appears to still call > it DEFAULT.debian-branch in its comments. > > I'm using git-buildpackage 0.7.1. should the default config file be > updated? or the code changed? or updated documentation written? The config file variables are always called debian-branch and upstream-branch. We only have the --git-* prefix on the commandline of "gbp buildpackge" to distinguish our options from options passed to the builder (this was inspired by svn-buildpackage back then). So if [DEFAULT] debian-branch = does not work this would be a bug. I don't see this here though. I e.g. have [DEFAULT] upstream-branch=upstream/sid debian-branch=debian/sid in debian/gbp.conf of e.g. libvirt without problems. $ gbp config buildpackage.debian-branch buildpackage.debian-branch=debian/sid $ gbp buildpackage --help | grep -A 2 -e --git-debian-branch --git-debian-branch=DEBIAN_BRANCH Branch the Debian package is being developed on, default is 'debian/sid' (both command run from within the repo that has the debian/gbp.conf). And outside of that repo: $ gbp config buildpackage.debian-branch buildpackage.debian-branch=master The code did not change recently so I really wonder what could trigger this on your end? Are you overriding branch names in a [buildpackage] section as well? Cheers, -- Guido ___ git-buildpackage mailing list git-buildpackage@lists.sigxcpu.org http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
