diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/lp-1100491-fix-broken-add-sources.patch | 11 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 29c0596b..089c8c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cloud-init (0.6.3-0ubuntu1.4) precise-proposed; urgency=high + + * lp-1100491-fix-broken-add-sources.patch: fix use of + 'apt_sources' in cloud-config. (LP: #1100491) + + -- Scott Moser <smoser@ubuntu.com> Wed, 16 Jan 2013 17:19:50 -0500 + cloud-init (0.6.3-0ubuntu1.3) precise-proposed; urgency=low * debian/patches/lp-1070345-landscape-restart-after-change.patch, diff --git a/debian/patches/lp-1100491-fix-broken-add-sources.patch b/debian/patches/lp-1100491-fix-broken-add-sources.patch new file mode 100644 index 00000000..9e29b31d --- /dev/null +++ b/debian/patches/lp-1100491-fix-broken-add-sources.patch @@ -0,0 +1,11 @@ +--- a/cloudinit/CloudConfig/cc_apt_update_upgrade.py ++++ b/cloudinit/CloudConfig/cc_apt_update_upgrade.py +@@ -72,7 +72,7 @@ def handle(name, cfg, cloud, log, _args) + params = mirrors + params['RELEASE'] = release + params['MIRROR'] = mirror +- errors = add_sources(cloud, cfg['apt_sources'], params) ++ errors = add_sources(cfg['apt_sources'], params) + for e in errors: + log.warn("Source Error: %s\n" % ':'.join(e)) + diff --git a/debian/patches/series b/debian/patches/series index be916d13..59a12729 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ lp-974509-detect-dns-server-redirection.patch lp-1018554-shutdown-message-to-console.patch lp-1073077-zsh-workaround-for-locale_warn.patch rework-mirror-selection.patch +lp-1100491-fix-broken-add-sources.patch |