Package: git-buildpackage
Version: 0.6.0~git20130506
Severity: normal
Tags: patch
In gbp/scripts/buildpackage.py the export_dir function is called with a
wrong parameter. Because of this the combination of export-dir and
overlay=True options (aka svn-buildpackage mergeWithUpstream emulation)
does not work anymore. This error was introduced in commit d510f2a0.
The following patch fixes the problem:
----
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index d59a76d..282795a 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -521,7 +521,7 @@ def main(argv):
# Export to another build dir if requested:
if options.export_dir:
tmp_dir = os.path.join(output_dir, "%s-tmp" % source.sourcepkg)
- export_source(repo, tree, source.changelog, options, tmp_dir,
output_dir)
+ export_source(repo, tree, source, options, tmp_dir, output_dir)
# Run postexport hook
if options.postexport:
----
Gaudenz
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (800, 'testing'), (700, 'unstable'), (50, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_CH.UTF-8, LC_CTYPE=de_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.12.6
ii git 1:1.7.10.4-2
ii man-db 2.6.3-3
ii python 2.7.3-5
ii python-dateutil 1.5+dfsg-0.1
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.70
ii pristine-tar 1.28
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-3
ii unzip 6.0-9
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
