From patchwork Mon Dec 19 14:47:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5881 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 182EB23E2E for ; Mon, 19 Dec 2011 14:47:59 +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 0EB1BA190F9 for ; Mon, 19 Dec 2011 14:47:59 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so2004962eaa.11 for ; Mon, 19 Dec 2011 06:47:59 -0800 (PST) Received: by 10.205.138.136 with SMTP id is8mr1596111bkc.35.1324306078850; Mon, 19 Dec 2011 06:47:58 -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.82.144 with SMTP id ac16cs8053bkc; Mon, 19 Dec 2011 06:47:58 -0800 (PST) Received: by 10.205.133.129 with SMTP id hy1mr1695206bkc.28.1324306077079; Mon, 19 Dec 2011 06:47:57 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id cr8si10438972wib.39.2011.12.19.06.47.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Dec 2011 06:47:57 -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 1RceVE-00034Y-DG; Mon, 19 Dec 2011 14:47:56 +0000 Received: from wookey by dream.aleph1.co.uk with local (Exim 4.72) (envelope-from ) id 1RceV8-00067f-5B; Mon, 19 Dec 2011 14:47:38 +0000 From: wookey@wookware.org To: buildd-tools-devel@lists.alioth.debian.org Cc: patches@linaro.org, Wookey Date: Mon, 19 Dec 2011 14:47:35 +0000 Message-Id: <1324306056-23512-1-git-send-email-wookey@wookware.org> X-Mailer: git-send-email 1.7.2.5 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=-2.1 required=4.5 tests=AWL,BAYES_00 autolearn=no version=3.3.1 Subject: [PATCH 2352/2353] Add an error check in dpkg_setup, and fix up whitespace 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/ResolverBase.pm | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/Sbuild/ResolverBase.pm b/lib/Sbuild/ResolverBase.pm index 963e194..06ac8fc 100644 --- a/lib/Sbuild/ResolverBase.pm +++ b/lib/Sbuild/ResolverBase.pm @@ -140,11 +140,15 @@ sub setup_dpkg { if ($self->get_conf('HOST_ARCH') ne $self->get_conf('BUILD_ARCH')) { $session->run_command( - { COMMAND => ['echo', 'foreign-architecture ' . $self->get_conf('HOST_ARCH'), '>', '/etc/dpkg/dpk.cfg.d/sbuild'], - USER => 'root' }); - # We should get this much nicer interface with new dpkg upload. - # { COMMAND => ['dpkg', '--add-foreign-architecture ', $self->get_conf('HOST_ARCH')], - # USER => 'root' }); + { COMMAND => ['echo', '"foreign-architecture ' . $self->get_conf('HOST_ARCH') . '"', '>', '/etc/dpkg/dpkg.cfg.d/sbuild'], + USER => 'root' }); + # We should get this much nicer interface with new dpkg upload. + # { COMMAND => ['dpkg', '--add-foreign-architecture ', $self->get_conf('HOST_ARCH')], + # USER => 'root' }); + if ($?) { + $self->log_error("E: Failed to set dpkg foreign-architecture config\n"); + return 0; + } $self->log("Setting dpkg foreign-architecture\n"); } }