A proposed fix follows. But please note, I'm by far not an Python programmer, so I just tried to understand what's going on and introduced the necessary changes.
It's of "works for me" quality. :)
--- dist-packages/gbp/scripts/buildpackage.py 2019-09-29 11:49:49.928996655
+0200
+++ /tmp/patched 2019-09-29 11:49:46.608888056 +0200
@@ -284,7 +284,7 @@
setattr(options, hook, '')
-def changes_file_suffix(builder, dpkg_args):
+def changes_file_suffix(builder, dpkg_args, arch):
"""
>>> changes_file_suffix('debuild', ['-A'])
'all'
@@ -303,15 +303,15 @@
elif '-A' in args:
return 'all'
else:
- return os.getenv('ARCH', None) or du.get_arch()
+ return arch or os.getenv('ARCH', None) or du.get_arch()
-def changes_file_name(source, build_dir, builder, dpkg_args):
+def changes_file_name(source, build_dir, builder, dpkg_args, arch):
return os.path.abspath("%s/../%s_%s_%s.changes" %
(build_dir,
source.changelog.name,
source.changelog.noepoch,
- changes_file_suffix(builder, dpkg_args)))
+ changes_file_suffix(builder, dpkg_args, arch)))
def check_branch(repo, options):
@@ -509,7 +509,7 @@
else source.upstream_version)
export_dir = os.path.join(output_dir, "%s-%s" % (source.sourcepkg,
major))
build_dir = export_dir if options.export_dir else repo.path
- changes_file = changes_file_name(source, build_dir,
options.builder, dpkg_args)
+ changes_file = changes_file_name(source, build_dir,
options.builder, dpkg_args, options.pbuilder_arch)
# Run preexport hook
if options.export_dir and options.preexport:
Best regards from Dresden/Germany
Viele Grüße aus Dresden
Heiko Schlittermann
--
SCHLITTERMANN.de ---------------------------- internet & unix support -
Heiko Schlittermann, Dipl.-Ing. (TU) - {fon,fax}: +49.351.802998{1,3} -
gnupg encrypted messages are welcome --------------- key ID: F69376CE -
! key id 7CBF764A and 972EAC9F are revoked since 2015-01 ------------ -
signature.asc
Description: PGP signature
