From patchwork Wed Dec 21 22:41:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5939 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 B18F124056 for ; Wed, 21 Dec 2011 22:41:44 +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 A7C24A18165 for ; Wed, 21 Dec 2011 22:41:44 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so5149700eaa.11 for ; Wed, 21 Dec 2011 14:41:44 -0800 (PST) Received: by 10.204.129.24 with SMTP id m24mr2545557bks.89.1324507304466; Wed, 21 Dec 2011 14:41:44 -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 ac16cs51932bkc; Wed, 21 Dec 2011 14:41:44 -0800 (PST) Received: by 10.216.136.161 with SMTP id w33mr5750525wei.40.1324507303008; Wed, 21 Dec 2011 14:41:43 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id eu12si3726460wbb.48.2011.12.21.14.41.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Dec 2011 14:41:43 -0800 (PST) Received-SPF: neutral (google.com: 80.68.88.63 is neither permitted nor denied by best guess record for domain of wookey@wookware.org) client-ip=80.68.88.63; Authentication-Results: mx.google.com; spf=neutral (google.com: 80.68.88.63 is neither permitted nor denied by best guess record for domain of wookey@wookware.org) smtp.mail=wookey@wookware.org Received: from cpc5-cmbg4-0-0-cust802.5-4.cable.virginmedia.com ([86.14.235.35] helo=kh.home.wookware.org) by stoneboat.aleph1.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1RdUqy-0001uJ-IG; Wed, 21 Dec 2011 22:41:42 +0000 Received: from wookey by kh.home.wookware.org with local (Exim 4.77) (envelope-from ) id 1RdUqx-0006aX-Gb; Wed, 21 Dec 2011 22:41:39 +0000 From: wookey@wookware.org To: buildd-tools-devel@lists.alioth.debian.org Cc: patches@linaro.org, Wookey Date: Wed, 21 Dec 2011 22:41:09 +0000 Message-Id: <1324507270-25272-3-git-send-email-wookey@wookware.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1324507270-25272-1-git-send-email-wookey@wookware.org> References: <1324507270-25272-1-git-send-email-wookey@wookware.org> X-SA-Exim-Connect-IP: 86.14.235.35 X-SA-Exim-Mail-From: wookey@wookware.org 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.9 required=4.5 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=no version=3.3.1 Subject: [PATCH 3/3] Fix apt-get build-dep comand so it works. This code needs moving into AptResolver->install_deps 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 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm index 0ef5004..3042836 100644 --- a/lib/Sbuild/Build.pm +++ b/lib/Sbuild/Build.pm @@ -685,12 +685,12 @@ sub run_fetch_install_packages { # install cross-deps. Hacked for now - need to generate dummy package $self->log('Cross-deps: Running apt-get -a ' . $self->get('Host_Arch') . ' build-dep ' . $self->get('Package') . "\n"); $resolver->run_apt_command( - { COMMAND => [$self->get_conf('APT_GET'), '-a ' . $self->get('Host_Arch'), 'build-dep', $self->get('Package')], + { COMMAND => [$self->get_conf('APT_GET'), '-a' . $self->get('Host_Arch'), 'build-dep', '-yf', $self->get('Package')], ENV => {'DEBIAN_FRONTEND' => 'noninteractive'}, USER => 'root', DIR => '/' }); if ($?) { - $self->log("Failed to get cross build-deps:\n"); + $self->log("Failed to get cross build-deps\n"); return 1; } }