diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/CloudConfig/cc_apt_update_upgrade.py | 13 |
2 files changed, 8 insertions, 6 deletions
@@ -17,6 +17,7 @@ - support configuration of landscape-client via cloud-config (LP: #857366) - part-handlers now get base64 decoded content rather than 2xbase64 encoded in the payload parameter. (LP: #874342) + - add test case framework [Mike Milner] (LP: #890851) 0.6.2: - fix bug where update was not done unless update was explicitly set. It would not be run if 'upgrade' or packages were set to be installed diff --git a/cloudinit/CloudConfig/cc_apt_update_upgrade.py b/cloudinit/CloudConfig/cc_apt_update_upgrade.py index a60512e1..0677ceb5 100644 --- a/cloudinit/CloudConfig/cc_apt_update_upgrade.py +++ b/cloudinit/CloudConfig/cc_apt_update_upgrade.py @@ -207,14 +207,15 @@ def find_apt_mirror(cloud, cfg): if mydom: doms.append(".%s" % mydom) - doms.extend((".localdomain", "",)) + if not mirror: + doms.extend((".localdomain", "",)) - mirror_list = [] - mirrorfmt = "http://%s-mirror%s/%s" % (distro, "%s", distro ) - for post in doms: - mirror_list.append(mirrorfmt % post) + mirror_list = [] + mirrorfmt = "http://%s-mirror%s/%s" % (distro, "%s", distro ) + for post in doms: + mirror_list.append(mirrorfmt % post) - mirror = util.search_for_mirror(mirror_list) + mirror = util.search_for_mirror(mirror_list) if not mirror: mirror = defaults[distro] |