Your message dated Fri, 28 Apr 2017 07:33:52 +0000
with message-id <[email protected]>
and subject line Bug#856263: fixed in git-buildpackage 0.8.15
has caused the Debian Bug report #856263,
regarding git-buildpackage: Incorrect handling of --basepath in
--git-pbuilder-options
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
856263: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=856263
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.8.12.2
Severity: normal
Tags: patch
Dear Maintainer,
I have had quite a bit of difficulty figuring out how to use
pbuilder/cowbuilder --basepath with gbp-buildpackage. After a bit of
digging I have figured out that my problems were caused by two issues.
First is that --git-pbuilder-options='--basepath foo' is overridden by
the default basepath because git-pbuilder supplies a default if
--basepath does not appear in "$@" (which it can't for
gbp-buildpackage). Attached patch 0001 fixes this.
The second issue is that --git-pbuilder-options is ignored when using
--git-builder without --git-pbuilder. Attached patch 0002 fixes this by
setting the pbuilder environment variables whenever the corresponding
option is configured. I think this is reasonable/expected, but if there
is a reason that these shouldn't be set, updating the man page to make
it clear which options are ignored when --git-pbuilder could be
workable.
Thanks for considering,
Kevin
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0+kevinoid1 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.17.1
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.85
ii pbuilder 0.228.4
ii pristine-tar 1.38
ii python-requests 2.12.4-1
Versions of packages git-buildpackage suggests:
pn python-notify <none>
ii sudo 1.8.19p1-1
ii unzip 6.0-21
-- no debconf information
>From d4060ff8cb31a008247edd639c45a129f8f5a302 Mon Sep 17 00:00:00 2001
Message-Id:
<d4060ff8cb31a008247edd639c45a129f8f5a302.1488181743.git.ke...@kevinlocke.name>
From: Kevin Locke <[email protected]>
Date: Mon, 27 Feb 2017 00:16:57 -0700
Subject: [PATCH 1/2] Set pbuilder env vars whenever configured
The previous behavior of only setting the pbuilder environment variables
when --git-pbuilder or --git-qemubuilder are configured leads to
difficult to debug issues when --git-builder is set to git-pbuilder but
--git-pbuilder is not set. This may seem like an odd corner case, but
it occurs in one of the top search results for [gbp.conf pbuilder][1].
This commit fixes that by setting the environment variables whenever
the corresponding options are configured.
1: https://github.com/russell/dotfiles/blob/master/gbp.conf
Signed-off-by: Kevin Locke <[email protected]>
---
gbp/scripts/buildpackage.py | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index e14122a..ceb272a 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -481,22 +481,24 @@ def setup_pbuilder(options, repo, native):
pr_builder = os.getenv("BUILDER") or '(cowbuilder)'
options.cleaner = '/bin/true'
- dist = get_pbuilder_dist(options, repo, native)
- pbd_env['GBP_PBUILDER_DIST'] = pbd_env['DIST'] = dist
- pr_dist = dist or 'sid'
- if options.pbuilder_arch:
- arch = options.pbuilder_arch
- pbd_env['GBP_PBUILDER_ARCH'] = pbd_env['ARCH'] = arch
- pr_arch = ":%s" % arch
- else:
- pr_arch = ""
- if options.use_qemubuilder:
- pbd_env['GBP_PBUILDER_BUILDER'] = pbd_env['BUILDER'] =
"qemubuilder"
- pr_builder = pbd_env["GBP_PBUILDER_BUILDER"]
- if not options.pbuilder_autoconf:
- pbd_env['GBP_PBUILDER_AUTOCONF'] =
pbd_env['GIT_PBUILDER_AUTOCONF'] = "no"
- if options.pbuilder_options:
- pbd_env['GBP_PBUILDER_OPTIONS'] = pbd_env['GIT_PBUILDER_OPTIONS']
= options.pbuilder_options
+ dist = get_pbuilder_dist(options, repo, native)
+ pbd_env['GBP_PBUILDER_DIST'] = pbd_env['DIST'] = dist
+ pr_dist = dist or 'sid'
+ if options.pbuilder_arch:
+ arch = options.pbuilder_arch
+ pbd_env['GBP_PBUILDER_ARCH'] = pbd_env['ARCH'] = arch
+ pr_arch = ":%s" % arch
+ else:
+ pr_arch = ""
+ if options.use_qemubuilder:
+ pbd_env['GBP_PBUILDER_BUILDER'] = pbd_env['BUILDER'] = "qemubuilder"
+ pr_builder = pbd_env["GBP_PBUILDER_BUILDER"]
+ if not options.pbuilder_autoconf:
+ pbd_env['GBP_PBUILDER_AUTOCONF'] = pbd_env['GIT_PBUILDER_AUTOCONF'] =
"no"
+ if options.pbuilder_options:
+ pbd_env['GBP_PBUILDER_OPTIONS'] = pbd_env['GIT_PBUILDER_OPTIONS'] =
options.pbuilder_options
+
+ if options.use_pbuilder or options.use_qemubuilder:
gbp.log.info("Building with %s for %s%s" % (pr_builder, pr_dist,
pr_arch))
hook_env = dict([(k, pbd_env[k]) for k in pbd_env if k.startswith("GBP_")])
--
2.11.0
>From bc8b66e1828aef7c242c363d1ddad15f24c1b2d0 Mon Sep 17 00:00:00 2001
Message-Id:
<bc8b66e1828aef7c242c363d1ddad15f24c1b2d0.1488181743.git.ke...@kevinlocke.name>
In-Reply-To:
<d4060ff8cb31a008247edd639c45a129f8f5a302.1488181743.git.ke...@kevinlocke.name>
References:
<d4060ff8cb31a008247edd639c45a129f8f5a302.1488181743.git.ke...@kevinlocke.name>
From: Kevin Locke <[email protected]>
Date: Mon, 27 Feb 2017 00:22:46 -0700
Subject: [PATCH 2/2] git-pbuilder: Check $OPTIONS for --basepath
Previously only the arguments were checked for --basepath. This
resulted in --basepath being ignored and overridden by the default when
passed in --git-pbuilder-options (either via command arguments or from
the configuration file). Since this is required when invoking
gbp-buildpackage (because args are passed to --debbuildopts), it's a
significant use case. This commit fixes the issue by searching both
args and $OPTIONS.
Signed-off-by: Kevin Locke <[email protected]>
---
bin/git-pbuilder | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/git-pbuilder b/bin/git-pbuilder
index a3bd282..30100ce 100644
--- a/bin/git-pbuilder
+++ b/bin/git-pbuilder
@@ -160,7 +160,7 @@ if [ no != "$GIT_PBUILDER_AUTOCONF" ]; then
# that and that alone, since if it's specified more than once,
# cowbuilder will fail.
bp_found=""
- for opt in $@; do
+ for opt in "$@" "${OPTIONS[@]}"; do
case $opt in
--basepath|--basepath=*) bp_found="yes" ;;
esac
--
2.11.0
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.8.15
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guido Günther <[email protected]> (supplier of updated git-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 28 Apr 2017 08:36:16 +0200
Source: git-buildpackage
Binary: git-buildpackage git-buildpackage-rpm
Architecture: all source
Version: 0.8.15
Distribution: experimental
Urgency: medium
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Closes: 822823 856263 861004 861206
Description:
git-buildpackage-rpm - Suite to help with RPM packages in Git repositories
git-buildpackage - Suite to help with Debian packages in Git repositories
Changes:
git-buildpackage (0.8.15) experimental; urgency=medium
.
[ Guido Günther ]
* [9fa917a] pull: give more detail about what we updated
* [1bf6ef4] docs: use [DEFAULT] section in import example so it also fits
the "gbp dch" usecase
* [ead7157] buildpackage: make --git-export=WC simpler to use by implying
--git-ignore-new --git-ignore-branch. There's no point in these safety
checks when we export the working copy as is. (Closes: #822823)
* [1832d14] Drop long deprecated --no-dch
* [000f924] buildpackage: add sloppy mode to build upstream tarballs. When
starting with packaging people often stumble over a mismatch between what
dpkg-source expects to be in the tarball and the generated tarball for
various reasons. Give them a way to say: "Use what I have on my current
debian branch" as upstream source. Also helpful for snapshot builds with
upstream modifications. (Closes: #861004)
* [1113c95] clone: Add support for pseudo protocols like vcsgit: and github:
to make cloning simpler (Closes: #861206)
* [a4667c7] dockerfile: add src uri for the gbp clone network test
.
[ Kevin Locke ]
* [a03af0d] git-pbuilder: Check $OPTIONS for --basepath.
Previously only the arguments were checked for --basepath. This
resulted in --basepath being ignored and overridden by the default when
passed in --git-pbuilder-options
(Closes: #856263)
Checksums-Sha1:
a41aecc1823f71c275c1a2e50d47d9acdd381562 2171 git-buildpackage_0.8.15.dsc
eeae3aaa0e4c635bcaa3e5ba5086386598447428 1731812 git-buildpackage_0.8.15.tar.xz
bcfe85096035d9ba07b45d6252a34699edca4150 105142
git-buildpackage-rpm_0.8.15_all.deb
3afa5cf732b622560b630f44ca147bf19a00d336 355036 git-buildpackage_0.8.15_all.deb
Checksums-Sha256:
04919813df58d1597e3a57e882083cec974974c826503decde31e94df5257457 2171
git-buildpackage_0.8.15.dsc
47b29f38b49ae689ed360322935f4b09b1be556d60906e95485ca76a925e4213 1731812
git-buildpackage_0.8.15.tar.xz
3cdbe84a0cf1272db93bf3b30acac0212d58dff081b26280507fc5d68c7cf7e5 105142
git-buildpackage-rpm_0.8.15_all.deb
87a9fb00a77536c707e75fcd45f9c161ee1c579d9c9847450999a56a9b7dff8b 355036
git-buildpackage_0.8.15_all.deb
Files:
3e69741965dfc374a51e2cc882eaabb2 2171 vcs optional git-buildpackage_0.8.15.dsc
c2b8b1c01907412d7c91f859c75edb7a 1731812 vcs optional
git-buildpackage_0.8.15.tar.xz
66b6d5372fb55a2eea1b6708cc3eb016 105142 vcs optional
git-buildpackage-rpm_0.8.15_all.deb
3efa3f85cfb26cdbdf56735fa8d4b252 355036 vcs optional
git-buildpackage_0.8.15_all.deb
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEvHzQcjh1660F3xzZB7i3sOqYEgsFAlkC7N4ACgkQB7i3sOqY
EgvL8A//Yx3V5J524yDOs9QZRjCxgh0uO9E9ubWVJtAQyQZ1btXsmBdI2Jsv2fdR
OkNloosziWla0sTX48lm5bPYXhtLRFJquO+iIVPeQzdZDmOq9t/o66e6W2nPf6H9
rd6HZBb5czwYuvKT0sxWbdThZqE39aGh1Hg/nm/E6nzvvKMOjOHFG5TjDJO075s+
erUENycXap9Rxw0tEy3XS71UQzP9CPMdmad32NgjBkV4BVJCFdFpFhgboJHqmcSb
oQ7OvJFTKPyzZNCOUAEXr8Yk08QPyMd40kzaE4tBlppFSbKYiLB9xXTZUcLtyjGE
VfJtZAhtR9to0jXJlbWVJQLkw+FL/rc3FVOXlpGTck7geOP9d4lsWC+HiAYoO/0g
Ry+lEF+dDWlcLZafOlK/llTTaC8RISrGFpSYaACwBisMvTMGmdg09ljIAJBIwP3C
rPzw9NAMJ1tFt7XhlcruXRFuxBL+16I1aYWpJ1jL6rdDVouGPTceqW+E8+u/Tp2I
P7Amvd8hL7kY07afrkgBqYbzaflGzMBgmYiViwPRNqfMTlNyxG9pN6DGaHE7I3eI
A0EFgvA+u9BNQxcjNRlBYr/YKP2WrvvJH6VMa1UoF0ZqmwnJdudzg6iOAf0y3CiW
5Xp8VGNwxGzeSNNF9JhAEZ+ra8XNqKLYGXci+AEgQ/unvcTdbNA=
=0Y2T
-----END PGP SIGNATURE-----
--- End Message ---
