From: Sage Weil <sage@inktank.com>
Date: Fri, 11 Jul 2014 22:45:50 +0000 (-0700)
Subject: fabfile: drop s/--assume-yes --no-install-recommends/-y/ to apt
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3fc82909e9505f214e453e30c476a96d6a9df053;p=autobuild-ceph.git

fabfile: drop s/--assume-yes --no-install-recommends/-y/ to apt

trusty doesn't like those options... and -y does the trick.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/fabfile.py b/fabfile.py
index 2dd2733..e75fba5 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -99,10 +99,11 @@ def _apt_install(*packages):
                 'env DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical',
                 'apt-get',
                 '-q',
+                '-y',
                 '-o', 'Dpkg::Options::=--force-confnew',
                 'install',
-                '--no-install-recommends',
-                '--assume-yes',
+#                '--no-install-recommends',
+#                '--assume-yes',
                 '--',
                 ]
             + list(packages)))
@@ -118,11 +119,12 @@ def _apt_reinstall_for_backports(*packages):
                 'env DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical',
                 'apt-get',
                 '-q',
+                '-y',
                 '-o', 'Dpkg::Options::=--force-confnew',
                 'install',
                 '--reinstall',
-                '--no-install-recommends',
-                '--assume-yes',
+#                '--no-install-recommends',
+#                '--assume-yes',
                 '--',
             ]
             + list(packages)))