Package: git-buildpackage
Version: 0.8.10
Followup-For: Bug #596513
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
I just wanted to file a new bug report "gbb-dch hardcodes
- --nomainttrailer' but we might as well re-use this old one, since it
is maybe the answer to my issue.
I was a bit surprised that gbp-dch recently started to always change
the trailer line in d/changelog on an innocent `gbp dch -a'. After
looking at the changelog and the git history it seems like this is a
side effect of fixing #796913, i.e. of commit 42878ff.
What we see in gbp/scripts/dch.py in fixup_section() is:
mainttrailer_opts = ['--nomainttrailer', '--mainttrailer', '-t']
...
for opt in mainttrailer_opts:
if opt in dch_options:
break
else:
opts.append(mainttrailer_opts[0])
which looks nice, except that I don't see how any of
'--nomainttrailer', '--mainttrailer', '-t' would ever get into
dch_options. (The only place where dch_options is set is in
process_options() further down, and there only the command line
options are used, and there's no trace of (no)mainttrailer anywhere.)
So in the end in fixup_section() we always end up in the else branch,
which means that '--nomainttrailer' is appended and is therefore
effectively hardcoded in a slightly complicated way :)
If, as the piece of code above indicates, it should be possible to
select between --nomainttrailer and --mainttrailer then gbp-dch
probably either needs commandline options and config variables to
allow it (hence adding to this old bug report) or it needs to read
~/.devscripts / use the dch settings. Or maybe there are other
options.
(I guess hardcoding '--nomainttrailer' was not the plan as this could
have been written in an easier way then it is currently done in
fixup_section().)
I'd very much like to see the old behaviour of not touching the
trailer (except for releases and new sections etc.) back one way or
another.
Cheers,
gregor
- -- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'unstable-debug'), (500,
'experimental'), (500, 'testing'), (500, 'stable'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=de_AT.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)
Versions of packages git-buildpackage depends on:
ii devscripts 2.17.0
ii git 1:2.11.0-2
ii man-db 2.7.6.1-2
ii python-dateutil 2.5.3-2
ii python-pkg-resources 33.1.1-1
ii python-six 1.10.0-3
pn python:any <none>
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.84
ii pbuilder 0.228.3
ii pristine-tar 1.38
ii python-requests 2.12.4-1
ii sbuild 0.73.0-4
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-4
ii sudo 1.8.19p1-1
ii unzip 6.0-21
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE0eExbpOnYKgQTYX6uzpoAYZJqgYFAliLndpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQx
RTEzMTZFOTNBNzYwQTgxMDREODVGQUJCM0E2ODAxODY0OUFBMDYACgkQuzpoAYZJ
qgbS8A/+LmSMJm8axZ8J4tgcGsKb14rKvdL8Ppyu5LxBkmo7qhM6MhuTSlFVeBGe
KkfFh+mDVTOMOrHknmc9anEXauCP23N4sbeC8ygjhuXK7jcaTBVrKO+8Szhtjfu4
KV2+4lozdWP7LwV0w2ftaZJUmyaak2sNP08gHxKs9evveLN2zHbewlMMQAarmdXK
oNBRDQXn4dcXpHXPli1kEya3qSdYgQXbC0fW9vi4gWEhsTB7d6QjLeNbWdjM/Xb1
TqgP/OujQm0OIA/QaFkJzt9DPmg1LhqzM/cYx3yPgmebyAUkFPsMxJPudRNrdd2v
4hrZF0jpt8njdz6PKZJSbgkRd3ILgyYXB8MUEy57+99b5DHBq2wDEpLxsG/WziIs
pSgXFC9zk2F5L2GOhTjtPiGAqldpAPyZEk666Yq7vhbA+gagevqDaNhQNkG1QcqV
F5woozi65CkecuVzNmjD4NHIDASKHQqHiYdjuiz3QBNhBzwleE0bkR38Bsa50Ocw
zWg1ZTVGOkPkysRQwQb/qPAaHn+chLs5/HNrpCsV5+25MQxLzhF1i76wYrmVN8Ju
LfdjtupBy/3c2Qsy3zGmKxLk8t2eLBuND7/+yXhYvwSs1L3dcju1KakNxDHnotxv
Ccs1Xj5en+m2LpKNYa8bgb2rOR93A2GIgovTPfaTZQ1dC51XV44=
=qT1C
-----END PGP SIGNATURE-----
