[buildd-tools-devel] [PATCH 16/17] Remove duplicated error (left over from before HOST/BUILD split)

wookey at wookware.org wookey at wookware.org
Tue Dec 13 02:37:41 UTC 2011


From: Wookey <wookey at wookware.org>

---
 lib/Sbuild/Build.pm |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm
index cdb52cf..c97e548 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -388,21 +388,13 @@ sub run_chroot_session {
 
 	$self->check_abort();
 	my $chroot_arch =  $self->chroot_arch();
-	if ($self->get('Arch') ne $chroot_arch) {
-	    Sbuild::Exception::Build->throw(error => "Build architecture (" . $self->get('Arch') .
-					    ") is not the same as the chroot architecture (" .
-					    $chroot_arch . ")",
-					    info => "Please specify the correct architecture with --arch, or use a chroot of the correct architecture",
-					    failstage => "create-session");
-	}
-
-	my $chroot_arch = $self->chroot_arch();
 	if ($self->get_conf('BUILD_ARCH') ne $chroot_arch) {
 	    Sbuild::Exception::Build->throw(
 		error => "Requested build architecture (" .
 		$self->get_conf('BUILD_ARCH') .
 		") and chroot architecture (" . $chroot_arch .
 		") do not match.  Skipping build.",
+		info => "Please specify the correct architecture with --build-arch, or use a chroot of the correct architecture",
 		failstage => "create-session");
 	}
 
-- 
1.7.5.4




More information about the Buildd-tools-devel mailing list