From patchwork Thu Jul 5 17:00:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: loic.minier@linaro.org X-Patchwork-Id: 9857 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 3F2D123E1B for ; Thu, 5 Jul 2012 17:00:28 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 03AE7A18345 for ; Thu, 5 Jul 2012 17:00:27 +0000 (UTC) Received: by ggnf1 with SMTP id f1so8256960ggn.11 for ; Thu, 05 Jul 2012 10:00:27 -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=7aB8F1TzBgLUDUoXSLuDetGbRuA8QTCQN4TFzehrURc=; b=T1diqrNutSnsX84O7FKfbOxtEJINEL6VcrDrh6mTk98LQvvqkJycsmALpZLkOfKHCj 2fMXEDhpZxX4QQUj8CDyG2U6slqdW5zCTM13/PDpfw6/Q7zC55jOahm/xSRw/f+arHmW 6uVmbRRlAtD8r+5ZKEA13ouH/6YTla4bNsohFcg6qrYDViNuItfiVRjiMmK2WTqfMWZy eOoC7AeioKR4ECJN54X6f4dP03eFVHzlMa/yErbkTSL7fmAiShzdC9uSsr17r/YMfScA 2ZzKn18KHn1DN8HQcQUp0GnIQAYPRsNWdEZvx9fp8fV4teOY/Nr6Qhz82ME0xaQjvjMf vTwQ== Received: by 10.50.193.196 with SMTP id hq4mr299165igc.57.1341507621791; Thu, 05 Jul 2012 10:00:21 -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.24.148 with SMTP id v20csp68387ibb; Thu, 5 Jul 2012 10:00:20 -0700 (PDT) Received: by 10.180.104.197 with SMTP id gg5mr932116wib.9.1341507620396; Thu, 05 Jul 2012 10:00:20 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id n17si24386570wee.46.2012.07.05.10.00.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 10:00:20 -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 1SmpPf-0002Nm-QT for ; Thu, 05 Jul 2012 17:00:19 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id BE283E02D0 for ; Thu, 5 Jul 2012 17:00:19 +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: 534 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 534: Merge lp:~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect; fixes Message-Id: <20120705170019.835.34417.launchpad@ackee.canonical.com> Date: Thu, 05 Jul 2012 17:00:19 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15544"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: bd0f45c31c512ea9129df6a5789f73e88b672571 X-Gm-Message-State: ALoCoQnEdu9ldF7Q+MAY3o1bqFzHS8KiqBOnj92+ZJTNvRSZi/MnpMEXLC0XbKXkCVZMZ4jwjbHp Merge authors: Emanuele Aina (emanuele-aina) Related merge proposals: https://code.launchpad.net/~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect/+merge/113556 proposed by: Emanuele Aina (emanuele-aina) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 534 [merge] fixes bug: https://launchpad.net/bugs/687608 committer: Loïc Minier branch nick: linaro-image-tools timestamp: Thu 2012-07-05 18:56:26 +0200 message: Merge lp:~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect; fixes parsing of APT sources when /etc/apt/source.list.d/ is empty; thanks Emanuele Aina; LP: #687608. 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-04-12 11:26:32 +0000 +++ linaro-hwpack-install 2012-07-05 14:44:04 +0000 @@ -138,7 +138,7 @@ while read line; do # Only install files that have at least one line not present in the # existing sources lists. - grep -qF "$line" /etc/apt/sources.list.d/* /etc/apt/sources.list \ + grep -qF "$line" $(find /etc/apt/sources.list.d/ -name '*.list') /etc/apt/sources.list \ || should_install=1 done < $stripped_file