summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-06-29 14:20:34 -0400
committerScott Moser <smoser@ubuntu.com>2012-06-29 14:20:34 -0400
commita1a7b1ce28ae57b57d98d6a06bca2a519b9b8f00 (patch)
tree81aeef8d72ba2d3011abbf49e00e194fc7894296
parent7f565b07cf7e1d05ba830d931f2d91d13b86a2e5 (diff)
parente99cf80f5881abc10ebcd8927adf16bd14f3045a (diff)
downloadvyos-cloud-init-a1a7b1ce28ae57b57d98d6a06bca2a519b9b8f00.tar.gz
vyos-cloud-init-a1a7b1ce28ae57b57d98d6a06bca2a519b9b8f00.zip
[merge from trunk] Use --quiet when running apt-get
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/distros/debian.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f701927b..4e307c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
- Huge refactor [Joshua Harlow]
0.6.4:
- support relative path in AuthorizedKeysFile (LP: #970071).
+ - make apt-get update run with --quiet (suitable for logging) (LP: #1012613)
0.6.3:
- add sample systemd config files [Garrett Holmstrom]
- add Fedora support [Garrent Holstrom] (LP: #883286)
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index b23945d8..3a0cae19 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -138,7 +138,7 @@ class Distro(distros.Distro):
# Or: http://tiny.cc/mh91fw
e['DEBIAN_FRONTEND'] = 'noninteractive'
cmd = ['apt-get', '--option', 'Dpkg::Options::=--force-confold',
- '--assume-yes', command]
+ '--assume-yes', '--quiet', command]
if args:
cmd.extend(args)
# Allow the output of this to flow outwards (ie not be captured)