summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_apt_configure.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-04 01:55:28 -0500
committerScott Moser <smoser@ubuntu.com>2016-03-04 01:55:28 -0500
commit1a9a408a7bf6d7a1a06254ad2939bd549acba69b (patch)
treeec4f76ea5260e269c83addbfafa4376ea2678059 /cloudinit/config/cc_apt_configure.py
parentbbf105baafbe788f7babbda188b513180424e256 (diff)
parent8092805079d011093724d87e9485e5bf79479a72 (diff)
downloadvyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.tar.gz
vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.zip
merge with trunk
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: