diff options
| author | Juerg Haefliger <juergh@gmail.com> | 2013-06-19 08:44:00 +0200 |
|---|---|---|
| committer | Juerg Haefliger <juergh@gmail.com> | 2013-06-19 08:44:00 +0200 |
| commit | 944623f4ad3e4c7319758c64053d06a3b05555a2 (patch) | |
| tree | c8766adf057692157a0c454ac24a02a9fc5022f1 /cloudinit/helpers.py | |
| parent | 812f82e7b3bad3f8127face552c76ef974b54661 (diff) | |
| download | vyos-cloud-init-944623f4ad3e4c7319758c64053d06a3b05555a2.tar.gz vyos-cloud-init-944623f4ad3e4c7319758c64053d06a3b05555a2.zip | |
fix and cleanup usage of util.logexc
Diffstat (limited to 'cloudinit/helpers.py')
| -rw-r--r-- | cloudinit/helpers.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cloudinit/helpers.py b/cloudinit/helpers.py index a4e6fb03..b91c1290 100644 --- a/cloudinit/helpers.py +++ b/cloudinit/helpers.py @@ -1,7 +1,7 @@ # vi: ts=4 expandtab # # Copyright (C) 2012 Canonical Ltd. -# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. +# Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P. # Copyright (C) 2012 Yahoo! Inc. # # Author: Scott Moser <scott.moser@canonical.com> @@ -216,8 +216,8 @@ class ConfigMerger(object): if ds_cfg and isinstance(ds_cfg, (dict)): d_cfgs.append(ds_cfg) except: - util.logexc(LOG, ("Failed loading of datasource" - " config object from %s"), self._ds) + util.logexc(LOG, "Failed loading of datasource config object " + "from %s", self._ds) return d_cfgs def _get_env_configs(self): @@ -227,8 +227,8 @@ class ConfigMerger(object): try: e_cfgs.append(util.read_conf(e_fn)) except: - util.logexc(LOG, ('Failed loading of env. config' - ' from %s'), e_fn) + util.logexc(LOG, 'Failed loading of env. config from %s', + e_fn) return e_cfgs def _get_instance_configs(self): @@ -242,8 +242,8 @@ class ConfigMerger(object): try: i_cfgs.append(util.read_conf(cc_fn)) except: - util.logexc(LOG, ('Failed loading of cloud-config' - ' from %s'), cc_fn) + util.logexc(LOG, 'Failed loading of cloud-config from %s', + cc_fn) return i_cfgs def _read_cfg(self): @@ -259,8 +259,8 @@ class ConfigMerger(object): try: cfgs.append(util.read_conf(c_fn)) except: - util.logexc(LOG, ("Failed loading of configuration" - " from %s"), c_fn) + util.logexc(LOG, "Failed loading of configuration from %s", + c_fn) cfgs.extend(self._get_env_configs()) cfgs.extend(self._get_instance_configs()) |