From patchwork Thu Apr 12 12:13:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 7762 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 B94C723E00 for ; Thu, 12 Apr 2012 12:13:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 552D6A1844B for ; Thu, 12 Apr 2012 12:13:14 +0000 (UTC) Received: by iage36 with SMTP id e36so3712417iag.11 for ; Thu, 12 Apr 2012 05:13:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=smVyFDrqGW+G4CVUTCHCaEe99skn3Vg/SyrPQr2tQv8=; b=afl5i/Ru7KDUUe5QANfQJWzmiUIJEZr3q6XMTRejidJM59Sc0ExezZqba7rW6RAZsa CZF+xcIEi38RtgPQd/AyTDo80QyNNQ1LoGosbM+BoEorT5ECoquW1Ui4+oVl/5RMcNpr TwCIjWbChvPtHQ9P2V8mGAorT8e0TW94Ad93/VPr/UDBjogdIoVN2idbLemgDoI0BMw6 UJ37TCljLOs3rwynIuOEAwgT6VEsUSDwKULUH/UOleiWnNRUKJqKpIpzvdmSR8QECd3X Ssokoomqc0D8Z7jlp1BP3NkTbivzpca5HC5/t3TxmqazA3t3ERxWcG8Mo+zg4xweHW8X iPXg== Received: by 10.50.188.199 with SMTP id gc7mr2261773igc.40.1334232793598; Thu, 12 Apr 2012 05:13:13 -0700 (PDT) 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.231.70.69 with SMTP id c5csp260425ibj; Thu, 12 Apr 2012 05:13:12 -0700 (PDT) Received: by 10.216.134.19 with SMTP id r19mr1367305wei.66.1334232791030; Thu, 12 Apr 2012 05:13:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id k69si5889864weq.92.2012.04.12.05.13.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Apr 2012 05:13:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SIIti-0005Rp-D4 for ; Thu, 12 Apr 2012 12:13:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 57C48E0148 for ; Thu, 12 Apr 2012 12:13:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 506 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 506: Allow FORCE_OPTIONS to be present when APT tries to update its cache: Message-Id: <20120412121310.26576.3762.launchpad@ackee.canonical.com> Date: Thu, 12 Apr 2012 12:13:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15070"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0ccc343b4df9508839c60c7fed54ad77cec7527b X-Gm-Message-State: ALoCoQmfZdQreuCXIE4QFGzzm0sCw2tU7Zs/UGdqkRRC5/z+BEDbTWv4wVTYkTDt35SU18NDE2Ti Merge authors: Fathi Boudra (fboudra) Related merge proposals: https://code.launchpad.net/~fboudra/linaro-image-tools/add-FORCE_OPTIONS-to-apt-update-bug979178/+merge/101719 proposed by: Fathi Boudra (fboudra) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 506 [merge] committer: Fathi Boudra branch nick: linaro-image-tools timestamp: Thu 2012-04-12 15:10:26 +0300 message: Allow FORCE_OPTIONS to be present when APT tries to update its cache: linaro-hwpack-install stops and asks for user interaction when trying to update APT cache from unsigned repositories. (LP: #979178) Thanks to Hector Oron modified: linaro-hwpack-install --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro-hwpack-install' --- linaro-hwpack-install 2012-03-23 06:13:05 +0000 +++ linaro-hwpack-install 2012-04-12 11:26:32 +0000 @@ -181,17 +181,17 @@ echo "deb file:${HWPACK_DIR}/pkgs ./" > "$SOURCES_LIST_FILE" cat /etc/apt/sources.list >> "$SOURCES_LIST_FILE" -echo "Updating apt package lists ..." -$sudo apt-get -o "$APT_GET_OPTIONS" update -q - -echo -n "Installing packages ..." - if [ "$FORCE_YES" == "yes" ]; then FORCE_OPTIONS="--yes --force-yes" else FORCE_OPTIONS="" fi +echo "Updating apt package lists ..." +$sudo apt-get $FORCE_OPTIONS -o "$APT_GET_OPTIONS" update -q + +echo -n "Installing packages ..." + # "newer" hwpacks contain a dependency package whose Depends is the # same as the packages config setting from the file the hwpack was # build from. But if we just installed that, a newer version of a