3
0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00

pbuilder-dist: change requested/system arch order in check (LP: )

This commit is contained in:
Emmet Hikory 2010-04-20 06:25:19 +09:00
parent 7d465094a0
commit 2b34773630
2 changed files with 5 additions and 2 deletions

5
debian/changelog vendored

@ -3,7 +3,10 @@ ubuntu-dev-tools (0.99) UNRELEASED; urgency=low
[ Luca Falavigna ] [ Luca Falavigna ]
* syncpackage: new script to easily upload pristine Debian packages. * syncpackage: new script to easily upload pristine Debian packages.
-- Luca Falavigna <dktrkranz@ubuntu.com> Sat, 17 Apr 2010 12:46:34 +0200 [ Andrey Voronov ]
* pbuilder-dist: change requested/system arch order in check (LP: #557097)
-- Emmet Hikory <persia@ubuntu.com> Tue, 20 Apr 2010 06:23:28 +0900
ubuntu-dev-tools (0.98) lucid; urgency=low ubuntu-dev-tools (0.98) lucid; urgency=low

@ -318,7 +318,7 @@ def main():
if requested_arch: if requested_arch:
app.build_architecture = requested_arch app.build_architecture = requested_arch
# For some foreign architectures we need to use qemu # 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') args.append('--debootstrap qemu-debootstrap')
if 'mainonly' in sys.argv: if 'mainonly' in sys.argv: