From patchwork Thu Mar 24 14:51:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 770 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:45:40 -0000 Delivered-To: patches@linaro.org Received: by 10.42.161.68 with SMTP id s4cs112481icx; Thu, 24 Mar 2011 07:51:19 -0700 (PDT) Received: by 10.227.172.193 with SMTP id m1mr7704237wbz.201.1300978278489; Thu, 24 Mar 2011 07:51:18 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id j7si14753617wbj.62.2011.03.24.07.51.18; Thu, 24 Mar 2011 07:51:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Q2lsb-0003z8-RH for ; Thu, 24 Mar 2011 14:51:17 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id C7A8D2E8134 for ; Thu, 24 Mar 2011 14:51:17 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-maintainers/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 303 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 303: Merge lp:~lool/linaro-image-tools/really-automatic-apt; fixes automatic Message-Id: <20110324145117.31815.42089.launchpad@loganberry.canonical.com> Date: Thu, 24 Mar 2011 14:51:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12633"; Instance="initZopeless config overlay" X-Launchpad-Hash: b44a705245b28b52d6957d2191163123f399ecbb Merge authors: Loïc Minier (lool) Related merge proposals: https://code.launchpad.net/~lool/linaro-image-tools/really-automatic-apt/+merge/54686 proposed by: Loïc Minier (lool) review: Approve - Guilherme Salgado (salgado) ------------------------------------------------------------ revno: 303 [merge] fixes bug(s): https://launchpad.net/bugs/741638 committer: Loïc Minier branch nick: linaro-image-tools timestamp: Thu 2011-03-24 15:49:25 +0100 message: Merge lp:~lool/linaro-image-tools/really-automatic-apt; fixes automatic installation of missing packages when APT pulls multiple packages; LP: #741638. modified: linaro_image_tools/media_create/tests/test_media_create.py linaro_image_tools/media_create/utils.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-maintainers/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-maintainers/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-03-23 22:55:29 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-03-24 14:49:25 +0000 @@ -178,7 +178,7 @@ fixture = self.useFixture(MockCmdRunnerPopenFixture()) install_package_providing('mkfs.vfat') self.assertEqual( - ['%s apt-get install dosfstools' % sudo_args], + ['%s apt-get --yes install dosfstools' % sudo_args], fixture.mock.commands_executed) def test_not_found_package(self): === modified file 'linaro_image_tools/media_create/utils.py' --- linaro_image_tools/media_create/utils.py 2011-03-23 22:25:10 +0000 +++ linaro_image_tools/media_create/utils.py 2011-03-24 11:49:40 +0000 @@ -48,7 +48,8 @@ package, _ = packages[0] print ("Installing required command %s from package %s" % (command, package)) - cmd_runner.run(['apt-get', 'install', package], as_root=True).wait() + cmd_runner.run( + ['apt-get', '--yes', 'install', package], as_root=True).wait() def ensure_command(command):