Ubuntu
ubuntu-dev-tools package

Merge lp:~voronov84/ubuntu/lucid/ubuntu-dev-tools/lucid into lp:ubuntu/lucid/ubuntu-dev-tools

  1. Lucid (10.04)
  2. lucid
  3. Merge into lucid
Proposed by Andrey Voronov on 2010-04-16
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~voronov84/ubuntu/lucid/ubuntu-dev-tools/lucid
Merge into: lp:ubuntu/lucid/ubuntu-dev-tools
Diff against target: 12 lines (+1/-1)
1 file modified
pbuilder-dist (+1/-1)
To merge this branch: bzr merge lp:~voronov84/ubuntu/lucid/ubuntu-dev-tools/lucid
Reviewer Review Type Date Requested Status
Emmet Hikory (community) Approve on 2010-04-19
Ubuntu branches 2010-04-16 Pending
Review via email: mp+23577@code.launchpad.net

Description of the Change

This commit contains lp: #557097 fix

To post a comment you must log in.
Emmet Hikory (persia) wrote :

Looks good to me. Patch applied to trunk.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pbuilder-dist'
2--- pbuilder-dist 2010-03-08 20:45:09 +0000
3+++ pbuilder-dist 2010-04-16 20:00:32 +0000
4@@ -318,7 +318,7 @@
5 if requested_arch:
6 app.build_architecture = requested_arch
7 # For some foreign architectures we need to use qemu
8- 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")):
9+ 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")]:
10 args.append('--debootstrap qemu-debootstrap')
11
12 if 'mainonly' in sys.argv:

Subscribers

People subscribed via source and target branches

to all changes: