From 944c1d1981c8eb9fc163621b3134b1d21ee6d1fa Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 21 Jul 2010 11:43:27 -0400
Subject: invoke apt so dpkg non-interactively takes old conf files (LP:
#607642)
---
cloudinit/CloudConfig/cc_apt_update_upgrade.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cloudinit/CloudConfig/cc_apt_update_upgrade.py b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
index 50c93222..e1226c85 100644
--- a/cloudinit/CloudConfig/cc_apt_update_upgrade.py
+++ b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
@@ -65,7 +65,10 @@ def handle(name,cfg,cloud,log,args):
e['DEBIAN_FRONTEND']='noninteractive'
if upgrade:
- subprocess.Popen(['apt-get', 'upgrade', '--assume-yes'], env=e).communicate()
+ cmd=[ 'apt-get', '--option', 'Dpkg::Options::=--force-confold',
+ 'upgrade', '--assume-yes' ]
+
+ subprocess.Popen(cmd, env=e).communicate()
if pkglist:
cmd=['apt-get', 'install', '--assume-yes']
--
cgit v1.2.3