pbuilder-dist: Use the same chroot, whether the system-architecture was

the supplied architecture or was chosen by default (LP: #943435)
This commit is contained in:
Stefano Rivera 2012-02-29 23:23:05 +02:00
parent 0eb6010448
commit 346aae9d42
2 changed files with 5 additions and 1 deletions

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ ubuntu-dev-tools (0.140) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.3, no changes needed.
* Update machine-readable copyright Format to 1.0.
* pbuilder-dist: Use the same chroot, whether the system-architecture was
the supplied architecture or was chosen by default (LP: #943435)
-- Stefano Rivera <stefanor@debian.org> Sat, 25 Feb 2012 16:09:53 +0200

View File

@ -187,8 +187,10 @@ class PbuilderDist:
and return it as a string.
"""
if not self.build_architecture:
self.chroot_string = self.target_distro
self.build_architecture = self.system_architecture
if self.build_architecture == self.system_architecture:
self.chroot_string = self.target_distro
else:
self.chroot_string = (self.target_distro + '-'
+ self.build_architecture)