[git-buildpackage] debian-branch vs. git-debian-branch

[Guido Günther]

Hi,
On Thu, Jan 21, 2016 at 06:28:20PM -0500, Daniel Kahn Gillmor wrote:
> 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)

"gbp-buildpackage" has:

CONFIGURATION FILES
       Several gbp.conf files are parsed to set defaults for the above
       command-line arguments. See the gbp.conf(5)> manpage for details.

I changed this slightly:

  https://git.sigxcpu.org/cgit/git-buildpackage/commit/?id=2f0d139196f1dbaad6e810b1cd50d9bdbe5dddc3

hopefully imroving readability.

> > So if 
> >
> > [DEFAULT]
> > debian-branch = <whatever>
> >
> > 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:

It seems extra space confuses Python's config parser:

> 
> 0 dkg at alice:~/src/libreswan/libreswan$ cat debian/gbp.conf 
> [ DEFAULT ]
   ^       ^

If I add space in my config parsing breaks, removing the space fixes
it. So

[DEFAULT]

> pristine-tar = True
> upstream-branch = master
> upstream-vcs-tag = v%(version)s
> debian-branch=debian

should work. Does it?

Cheers,
 -- Guido