From patchwork Wed Dec 14 17:54:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5709 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4E18923E0E for ; Wed, 14 Dec 2011 17:55:55 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 445B5A18067 for ; Wed, 14 Dec 2011 17:55:55 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id k10so972414eaa.11 for ; Wed, 14 Dec 2011 09:55:55 -0800 (PST) Received: by 10.204.156.208 with SMTP id y16mr1698886bkw.72.1323885354987; Wed, 14 Dec 2011 09:55:54 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs15407bkc; Wed, 14 Dec 2011 09:55:54 -0800 (PST) Received: by 10.224.202.8 with SMTP id fc8mr11402402qab.10.1323885353154; Wed, 14 Dec 2011 09:55:53 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id em21si1978049wbb.67.2011.12.14.09.55.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Dec 2011 09:55:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of wookey@aleph1.co.uk designates 80.68.88.63 as permitted sender) client-ip=80.68.88.63; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of wookey@aleph1.co.uk designates 80.68.88.63 as permitted sender) smtp.mail=wookey@aleph1.co.uk Received: from host-78-151-164-206.static.as13285.net ([78.151.164.206] helo=dream.aleph1.co.uk) by stoneboat.aleph1.co.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Rat3R-0005JO-Pv; Wed, 14 Dec 2011 17:55:52 +0000 Received: from wookey by dream.aleph1.co.uk with local (Exim 4.72) (envelope-from ) id 1Rat3L-0006Dj-RL; Wed, 14 Dec 2011 17:55:39 +0000 From: wookey@linaro.org To: patches@linaro.org Cc: Wookey Date: Wed, 14 Dec 2011 17:54:32 +0000 Message-Id: <1323885273-23505-16-git-send-email-wookey@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1323885273-23505-1-git-send-email-wookey@linaro.org> References: <1323885273-23505-1-git-send-email-wookey@linaro.org> X-SA-Exim-Connect-IP: 78.151.164.206 X-SA-Exim-Mail-From: wookey@aleph1.co.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on stoneboat.aleph1.co.uk X-Spam-Level: X-Spam-Status: No, score=-1.9 required=4.5 tests=BAYES_00 autolearn=no version=3.3.1 Subject: [PATCH 16/17] Remove duplicated error (left over from before HOST/BUILD split) X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on stoneboat.aleph1.co.uk) From: Wookey --- 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"); }