Package: git-buildpackage
Version: 0.5.24
Severity: important
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

0.5.24 ignores the (--git-)builder setting, both on the commandline
and in ~/.gbp.conf, and insists on using git-pbuilder.

$ grep builder ~/.gbp.conf 
builder = buildpackage-pdebuild

0.5.23:

$ git-buildpackage --git-verbose
gbp:debug: ['git', 'branch', '--no-color']
gbp:debug: fakeroot debian/rules clean [] []
rm -f build
dh_auto_clean
dh_clean
gbp:debug: ['git', 'branch', '--no-color']
gbp:debug: ['git', 'log', '--pretty=format:%H', '--grep=pristine-tar .* 
hello-debhelper_2.7\\.orig.tar\\.', 'pristine-tar', '--']
gbp:debug: Found pristine-tar commit at 
'1bef85e28e2a93b94d0483cd5d60d1bd6b23af24'
gbp:debug: ['git', 'log', '-n1', '--pretty=format:%s', 
'1bef85e28e2a93b94d0483cd5d60d1bd6b23af24']
gbp:debug: Determined compression type 'gzip'
gbp:debug: Looking for orig tarball 'hello-debhelper_2.7.orig.tar.gz' at 
'../tarballs/'
gbp:info: Orig tarball 'hello-debhelper_2.7.orig.tar.gz' not found at 
'../tarballs/'
gbp:debug: ['git', 'ls-tree', 'HEAD']
gbp:info: Exporting 'HEAD' to '/tmp/hello/build-area/hello-debhelper-tmp'
gbp:info: Moving '/tmp/hello/build-area/hello-debhelper-tmp' to 
'/tmp/hello/build-area/hello-debhelper-2.7'
gbp:debug: buildpackage-pdebuild [] []

$ git-buildpackage --help
[..]
  external command options:
    how and when to invoke external commands and hooks

    --git-builder=BUILDER
                        command to build the Debian package, default is
                        'buildpackage-pdebuild'

0.5.24:

$ git-buildpackage --git-verbose
gbp:debug: ['git', 'branch', '--no-color']
gbp:debug: fakeroot debian/rules clean [] []
rm -f build
dh_auto_clean
dh_clean
gbp:debug: ['git', 'branch', '--no-color']
gbp:debug: ['git', 'log', '--pretty=format:%H', '--grep=pristine-tar .* 
hello-debhelper_2.7\\.orig.tar\\.', 'pristine-tar', '--']
gbp:debug: Found pristine-tar commit at 
'1bef85e28e2a93b94d0483cd5d60d1bd6b23af24'
gbp:debug: ['git', 'log', '-n1', '--pretty=format:%s', 
'1bef85e28e2a93b94d0483cd5d60d1bd6b23af24']
gbp:debug: Determined compression type 'gzip'
gbp:debug: Looking for orig tarball 'hello-debhelper_2.7.orig.tar.gz' at 
'../tarballs/'
gbp:info: Orig tarball 'hello-debhelper_2.7.orig.tar.gz' not found at 
'../tarballs/'
gbp:debug: ['git', 'ls-tree', 'HEAD']
gbp:info: Exporting 'HEAD' to '/tmp/hello/build-area/hello-debhelper-tmp'
gbp:info: Moving '/tmp/hello/build-area/hello-debhelper-tmp' to 
'/tmp/hello/build-area/hello-debhelper-2.7'
gbp:debug: git-pbuilder [] []

$ git-buildpackage --help
[..]
    --git-builder=BUILDER
                        command to build the Debian package, default is
                        'buildpackage-pdebuild'
[..]
    --git-pbuilder      Invoke git-pbuilder for building, default is 'False'
    --git-no-pbuilder   negates '--git-pbuilder'
    --git-qemubuilder=USE_QEMUBUILDER
                        Invoke git-pbuilder with qemubuilder for building,
                        default is 'False'


I'm not sure where this behaviour comes from, my guess after looking
through the diff (and the help output above) is that it's somehow
related to the new qemubuilder option.


Ha, found it, and it's simple:

#v+
- --- a/git-buildpackage
+++ b/git-buildpackage
@@ -387,7 +387,7 @@ def parse_args(argv, prefix):
     cmd_group.add_config_file_option(option_name="posttag", dest="posttag",
                       help="hook run after a successful tag operation, default 
is '%(posttag)s'")
     cmd_group.add_boolean_config_file_option(option_name="pbuilder", 
dest="use_pbuilder")
- -    cmd_group.add_config_file_option(option_name="qemubuilder", 
dest="use_qemubuilder")
+    cmd_group.add_boolean_config_file_option(option_name="qemubuilder", 
dest="use_qemubuilder")
     cmd_group.add_config_file_option(option_name="dist", dest="pbuilder_dist")
     cmd_group.add_config_file_option(option_name="arch", dest="pbuilder_arch")
     export_group.add_config_file_option(option_name="export-dir", 
dest="export_dir", type="path",
#v-


Cheers,
gregor


- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'oldstable'), (500, 'experimental'), 
(500, 'testing'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.39-1-686-pae (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=de_AT.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages git-buildpackage depends on:
ii  devscripts                   2.10.73     scripts to make the life of a Debi
ii  git [git-core]               1:1.7.5.1-1 fast, scalable, distributed revisi
ii  python                       2.6.6-14    interactive high-level object-orie
ii  python-dateutil              1.4.1-3     powerful extensions to the standar
ii  python-support               1.0.13      automated rebuilding support for P

Versions of packages git-buildpackage recommends:
ii  cowbuilder                    0.62+nmu2  pbuilder running on cowdancer
ii  pristine-tar                  1.13       regenerate pristine tarballs

Versions of packages git-buildpackage suggests:
pn  git-load-dirs                 <none>     (no description available)
ii  python-notify                 0.1.1-2+b3 Python bindings for libnotify

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJN2BtlAAoJELs6aAGGSaoGEjYP/0pFpmmMFiBt8T5VqEKG8Y/t
RwNjG6wajCulLDnFaoG1o6CTAO/2oUmQf9DrYcisqYXy/uD3CtIxKFQMDIfkHI/Z
DrtDQTiVqV9VMYAkUCeqOhlhiey1dz4d1OMHRm3NBqBekCloviwcjTWaaz99vbVv
48/A6udrd8UEj9Ea7prdg7lZnF+dBPOLrcGgY04ulEDRR65+bOQxkxjyrffmseoX
W8YFE5RHNPHtWbZgSlhpSTsA21nrZbpSJPxGX4LI16JOVBidb2cG395gAc2TKq3P
V6XcKoPVvt30QqcdoJx97B5Y/LbnTSsV8ru/Q/u0oiTo6BsE2xzrlGxErhZO5B+/
pLlpm8Z0n1vnPt01Oi36k6mknD1YrrQxKGjPCC8LSVcHF6zUNDa/1ZWAXh69j3P7
Z/S5B6EvIawT4GITDj6Vk9hiTWSUVZFrqPHKPk9/i17N4l5TarHSwCgbv1wpFfHf
kJbFbvVo6FMes+BcsSPtIFBTaeP5sVZ8X9NAosVebJgQrAD5KGDow8Y4ljwDrwoY
j9LvttVLgWdNh1P5sXLVHDnsIfScZejwBdszrpFWAzOZqQR33JKtAt5po7ZKBr8i
A980QIxUgXzs6dfzKogvjJtGMB1vRODZ7A9Agrcq6Wg8NYfyY7cZlDc5ve9eYRZf
f15VpXzXgNiZtyP3nUqL
=iItG
-----END PGP SIGNATURE-----



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to