From 9f50a40437477432a21b326b15c343ca6b8fe516 Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Thu, 1 Dec 2016 11:41:21 -0800 Subject: Moved --force-yes to right place Change-Id: I7e4a681e5329fdbab8781b45e0b34b4a6143bb4f Signed-off-by: Stuart Mackie --- charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py | 2 +- charms/trusty/cassandra/hooks/helpers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'charms') diff --git a/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py b/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py index 017a696..6dfe7ed 100644 --- a/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py +++ b/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py @@ -187,7 +187,7 @@ def apt_install(packages, options=None, fatal=False): if options is None: options = ['--option=Dpkg::Options::=--force-confold'] - cmd = ['apt-get', '--assume-yes'] + cmd = ['apt-get', '--assume-yes', '--force-yes'] cmd.extend(options) cmd.append('install') if isinstance(packages, six.string_types): diff --git a/charms/trusty/cassandra/hooks/helpers.py b/charms/trusty/cassandra/hooks/helpers.py index c94788f..b86a6b1 100644 --- a/charms/trusty/cassandra/hooks/helpers.py +++ b/charms/trusty/cassandra/hooks/helpers.py @@ -103,7 +103,7 @@ def install_packages(packages): # The DSE packages are huge, so this might take some time. status_set('maintenance', 'Installing packages') with autostart_disabled(['cassandra']): - fetch.apt_install(packages, options="--force-yes", fatal=True) + fetch.apt_install(packages, fatal=True) # FOR CHARMHELPERS -- cgit 1.2.3-korg