summaryrefslogtreecommitdiff
path: root/cloudinit/CloudConfig
diff options
context:
space:
mode:
authorDustin Kirkland <kirkland@ubuntu.com>2011-08-22 13:45:14 -0500
committerDustin Kirkland <kirkland@ubuntu.com>2011-08-22 13:45:14 -0500
commit3e417ab92486129f00902834d4d6926f91828737 (patch)
tree3290db1495845fb306695b185cf9af5757a5100f /cloudinit/CloudConfig
parent91cf9a3fbab9fcb005c0bfea50811589243781d5 (diff)
parenta1e3ec1651cf5f82c69f93aa5bc9ca485cce586e (diff)
downloadvyos-cloud-init-3e417ab92486129f00902834d4d6926f91828737.tar.gz
vyos-cloud-init-3e417ab92486129f00902834d4d6926f91828737.zip
merge from Adam, fixes LP: #831505
Diffstat (limited to 'cloudinit/CloudConfig')
-rw-r--r--cloudinit/CloudConfig/cc_apt_update_upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/cc_apt_update_upgrade.py b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
index 495b8522..41c34bc3 100644
--- a/cloudinit/CloudConfig/cc_apt_update_upgrade.py
+++ b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
@@ -127,7 +127,7 @@ def add_sources(srclist, searchList={ }):
source=ent['source']
if source.startswith("ppa:"):
- try: util.subp(["add-apt-repository",source])
+ try: util.subp(["add-apt-repository",source], "/dev/null")
except:
elst.append([source, "add-apt-repository failed"])
continue