From: Zack Cerza <zack@redhat.com>
Date: Tue, 17 Feb 2015 20:26:34 +0000 (-0700)
Subject: Don't fail just because apt-get update does
X-Git-Tag: 1.1.0~1001^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F442%2Fhead;p=teuthology.git

Don't fail just because apt-get update does

If we fail later anyway, fine. If not, yay!

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index a8f29f8fb..3d3cc0049 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -343,9 +343,9 @@ def _update_deb_package_list_and_install(ctx, remote, debs, config):
         ],
         stdout=StringIO(),
     )
+    remote.run(args=['sudo', 'apt-get', 'update'], check_status=False)
     remote.run(
         args=[
-            'sudo', 'apt-get', 'update', run.Raw('&&'),
             'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
             '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw(
                 'Dpkg::Options::="--force-confold"'),
@@ -909,9 +909,9 @@ def _upgrade_deb_packages(ctx, config, remote, debs):
         ],
         stdout=StringIO(),
     )
+    remote.run(args=['sudo', 'apt-get', 'update'], check_status=False)
     remote.run(
         args=[
-            'sudo', 'apt-get', 'update', run.Raw('&&'),
             'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
             '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw(
                 'Dpkg::Options::="--force-confold"'),