From 2b347736301ba443f9015c3d66c102d0cf63b310 Mon Sep 17 00:00:00 2001 From: Emmet Hikory Date: Tue, 20 Apr 2010 06:25:19 +0900 Subject: [PATCH] pbuilder-dist: change requested/system arch order in check (LP: #557097) --- debian/changelog | 5 ++++- pbuilder-dist | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae333bd..422d710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,10 @@ ubuntu-dev-tools (0.99) UNRELEASED; urgency=low [ Luca Falavigna ] * syncpackage: new script to easily upload pristine Debian packages. - -- Luca Falavigna Sat, 17 Apr 2010 12:46:34 +0200 + [ Andrey Voronov ] + * pbuilder-dist: change requested/system arch order in check (LP: #557097) + + -- Emmet Hikory Tue, 20 Apr 2010 06:23:28 +0900 ubuntu-dev-tools (0.98) lucid; urgency=low diff --git a/pbuilder-dist b/pbuilder-dist index 863466b..f377cae 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -318,7 +318,7 @@ def main(): if requested_arch: app.build_architecture = requested_arch # For some foreign architectures we need to use qemu - if requested_arch != app.system_architecture and (requested_arch, app.system_architecture) not in (("amd64", "i386"), ("amd64", "lpia"), ("arm", "armel"), ("armel", "arm"), ("i386", "lpia"), ("lpia", "i386"), ("powerpc", "ppc64"), ("ppc64", "powerpc"), ("sparc", "sparc64"), ("sparc64", "sparc")): + if requested_arch != app.system_architecture and (app.system_architecture, requested_arch) not in [("amd64", "i386"), ("amd64", "lpia"), ("arm", "armel"), ("armel", "arm"), ("i386", "lpia"), ("lpia", "i386"), ("powerpc", "ppc64"), ("ppc64", "powerpc"), ("sparc", "sparc64"), ("sparc64", "sparc")]: args.append('--debootstrap qemu-debootstrap') if 'mainonly' in sys.argv: