diff mbox

[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
State Accepted
Headers show

Commit Message

Loïc Minier March 24, 2011, 2:51 p.m. UTC 
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 <lool@dooz.org>
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
diff mbox

Patch

=== 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):