summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_apt_configure.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:39 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:39 -0400
commit90de5dfa9685a9585b651c38b21274a9aa05ec38 (patch)
tree238e33b0122e68154bc5773186b5938bac2fe34f /cloudinit/config/cc_apt_configure.py
parent0ec34747b61845bfce806065dd126dcb56fe4672 (diff)
parent5db46cfb68422b0c14d4a6c097553edd0016de3f (diff)
downloadvyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.tar.gz
vyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.zip
merge trunk at 0.7.7~bzr1176
Diffstat (limited to 'cloudinit/config/cc_apt_configure.py')
-rw-r--r--cloudinit/config/cc_apt_configure.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py
index 9e9e9e26..702977cb 100644
--- a/cloudinit/config/cc_apt_configure.py
+++ b/cloudinit/config/cc_apt_configure.py
@@ -91,7 +91,8 @@ def handle(name, cfg, cloud, log, _args):
if matchcfg:
matcher = re.compile(matchcfg).search
else:
- matcher = lambda f: False
+ def matcher(x):
+ return False
errors = add_sources(cfg['apt_sources'], params,
aa_repo_match=matcher)
@@ -173,7 +174,8 @@ def add_sources(srclist, template_params=None, aa_repo_match=None):
template_params = {}
if aa_repo_match is None:
- aa_repo_match = lambda f: False
+ def aa_repo_match(x):
+ return False
errorlist = []
for ent in srclist: