control: tags -1 +patch
I also met this issue, and verified above patch really works in my environment.
So enclose the patch and hope this can be merged into mainline soon.
Cheers,
--
Roger Shimizu, GMT +9 Tokyo
PGP/GPG: 4096R/6C6ACD6417B3ACB1
From: Heiko Schlittermann <h...@schlittermann.de>
Date: Sun, 29 Sep 2019 11:56:33 +0200
Subject: [PATCH] No ignore option --git-arch when constructing the GBP_CHANGES_FILE variable for the postbuild hook
Closes: #941345
---
gbp/scripts/buildpackage.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 9b3d67f..dc86592 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -287,7 +287,7 @@ def disable_hooks(options):
setattr(options, hook, '')
-def changes_file_suffix(builder, dpkg_args):
+def changes_file_suffix(builder, dpkg_args, arch):
"""
>>> changes_file_suffix('debuild', ['-A'])
'all'
@@ -306,15 +306,15 @@ def changes_file_suffix(builder, dpkg_args):
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):
@@ -514,7 +514,7 @@ def main(argv):
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:
