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).

3 files changed, 23 insertions, 20 deletions

diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py
index 64548d43..a834f8eb 100644
--- a/cloudinit/sources/DataSourceAltCloud.py
+++ b/cloudinit/sources/DataSourceAltCloud.py
@@ -1,10 +1,11 @@
 # vi: ts=4 expandtab
 #
 #    Copyright (C) 2009-2010 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: Joe VLcek <JVLcek@RedHat.com>
+#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License version 3, as
@@ -79,7 +80,7 @@ def read_user_data_callback(mount_dir):
         try:
             user_data = util.load_file(user_data_file).strip()
         except IOError:
-            util.logexc(LOG, ('Failed accessing user data file.'))
+            util.logexc(LOG, 'Failed accessing user data file.')
             return None
 
     return user_data
@@ -178,7 +179,7 @@ class DataSourceAltCloud(sources.DataSource):
             return False
 
         # No user data found
-        util.logexc(LOG, ('Failed accessing user data.'))
+        util.logexc(LOG, 'Failed accessing user data.')
         return False
 
     def user_data_rhevm(self):
@@ -205,12 +206,12 @@ class DataSourceAltCloud(sources.DataSource):
             (cmd_out, _err) = util.subp(cmd)
             LOG.debug(('Command: %s\nOutput%s') % (' '.join(cmd), cmd_out))
         except ProcessExecutionError, _err:
-            util.logexc(LOG, (('Failed command: %s\n%s') % \
-                (' '.join(cmd), _err.message)))
+            util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd),
+                        _err.message)
             return False
         except OSError, _err:
-            util.logexc(LOG, (('Failed command: %s\n%s') % \
-                (' '.join(cmd), _err.message)))
+            util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd),
+                        _err.message)
             return False
 
         floppy_dev = '/dev/fd0'
@@ -222,12 +223,12 @@ class DataSourceAltCloud(sources.DataSource):
             (cmd_out, _err) = util.subp(cmd)
             LOG.debug(('Command: %s\nOutput%s') % (' '.join(cmd), cmd_out))
         except ProcessExecutionError, _err:
-            util.logexc(LOG, (('Failed command: %s\n%s') % \
-                (' '.join(cmd), _err.message)))
+            util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd),
+                        _err.message)
             return False
         except OSError, _err:
-            util.logexc(LOG, (('Failed command: %s\n%s') % \
-                (' '.join(cmd), _err.message)))
+            util.logexc(LOG, 'Failed command: %s\n%s', ' '.join(cmd),
+                        _err.message)
             return False
 
         try:
@@ -236,8 +237,8 @@ class DataSourceAltCloud(sources.DataSource):
             if err.errno != errno.ENOENT:
                 raise
         except util.MountFailedError:
-            util.logexc(LOG, ("Failed to mount %s"
-                              " when looking for user data"), floppy_dev)
+            util.logexc(LOG, "Failed to mount %s when looking for user data",
+                        floppy_dev)
 
         self.userdata_raw = return_str
         self.metadata = META_DATA_NOT_SUPPORTED
@@ -272,8 +273,8 @@ class DataSourceAltCloud(sources.DataSource):
                 if err.errno != errno.ENOENT:
                     raise
             except util.MountFailedError:
-                util.logexc(LOG, ("Failed to mount %s"
-                                  " when looking for user data"), cdrom_dev)
+                util.logexc(LOG, "Failed to mount %s when looking for user "
+                            "data", cdrom_dev)
 
         self.userdata_raw = return_str
         self.metadata = META_DATA_NOT_SUPPORTED
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
index 81c8cda9..08f661e4 100644
--- a/cloudinit/sources/DataSourceCloudStack.py
+++ b/cloudinit/sources/DataSourceCloudStack.py
@@ -4,11 +4,13 @@
 #    Copyright (C) 2012 Cosmin Luta
 #    Copyright (C) 2012 Yahoo! Inc.
 #    Copyright (C) 2012 Gerard Dethier
+#    Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Author: Cosmin Luta <q4break@gmail.com>
 #    Author: Scott Moser <scott.moser@canonical.com>
 #    Author: Joshua Harlow <harlowja@yahoo-inc.com>
 #    Author: Gerard Dethier <g.dethier@gmail.com>
+#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License version 3, as
@@ -109,8 +111,8 @@ class DataSourceCloudStack(sources.DataSource):
                       int(time.time() - start_time))
             return True
         except Exception:
-            util.logexc(LOG, ('Failed fetching from metadata '
-                              'service %s'), self.metadata_address)
+            util.logexc(LOG, 'Failed fetching from metadata service %s',
+                        self.metadata_address)
             return False
 
     def get_instance_id(self):
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index 084abca7..4ef92a56 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -1,7 +1,7 @@
 # vi: ts=4 expandtab
 #
 #    Copyright (C) 2009-2010 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>
@@ -119,8 +119,8 @@ class DataSourceNoCloud(sources.DataSource):
                     if e.errno != errno.ENOENT:
                         raise
                 except util.MountFailedError:
-                    util.logexc(LOG, ("Failed to mount %s"
-                                      " when looking for data"), dev)
+                    util.logexc(LOG, "Failed to mount %s when looking for "
+                                "data", dev)
 
         # There was no indication on kernel cmdline or data
         # in the seeddir suggesting this handler should be used.