diff options
| author | Juerg Haefliger <juergh@gmail.com> | 2013-06-20 15:46:08 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-06-20 15:46:08 -0400 |
| commit | 852968303724c979b7a94ed69abdcff9c0e3cc93 (patch) | |
| tree | 4d7a925f5f4f56d618c2d7d9b1971b0fb1a7fe08 /cloudinit/mergers/m_list.py | |
| parent | 812f82e7b3bad3f8127face552c76ef974b54661 (diff) | |
| parent | 2f853948f269f50038533782ee45e381d60d02bf (diff) | |
| download | vyos-cloud-init-852968303724c979b7a94ed69abdcff9c0e3cc93.tar.gz vyos-cloud-init-852968303724c979b7a94ed69abdcff9c0e3cc93.zip | |
fix and tidy up logexc usage
Some of the usages of logexc contain incorrect arguments to logexc.
cloudinit/config/cc_ssh_import_id.py
cloudinit/distros/__init__.py
The tidy up here is to fix many others that pass rendered strings
to logexc rather than letting it handle rendering at a later date (or
not at all in the case where logging is disabled).
Diffstat (limited to 'cloudinit/mergers/m_list.py')
| -rw-r--r-- | cloudinit/mergers/m_list.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/mergers/m_list.py b/cloudinit/mergers/m_list.py index 76591bea..62999b4e 100644 --- a/cloudinit/mergers/m_list.py +++ b/cloudinit/mergers/m_list.py @@ -19,6 +19,7 @@ DEF_MERGE_TYPE = 'replace' MERGE_TYPES = ('append', 'prepend', DEF_MERGE_TYPE, 'no_replace') + def _has_any(what, *keys): for k in keys: if k in what: |