Merge lp:~harlowja/cloud-init/udelta-verify into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

Ensure that udelta is valid before including it as a float.

=== modified file 'cloudinit/util.py'
--- cloudinit/util.py	2013-07-30 18:28:09 +0000
+++ cloudinit/util.py	2013-09-07 07:11:07 +0000
@@ -1791,15 +1791,19 @@
         ret = func(*args, **kwargs)
     finally:
         delta = time.time() - start
+        udelta = None
         if ustart is not None:
             try:
                 udelta = float(uptime()) - ustart
             except ValueError:
-                udelta = "N/A"
+                pass
 
         tmsg = " took %0.3f seconds" % delta
         if get_uptime:
-            tmsg += "(%0.2f)" % udelta
+            if isinstance(udelta, (float)):
+                tmsg += " (%0.2f)" % udelta
+            else:
+                tmsg += " (N/A)"
         try:
             logfunc(msg + tmsg)
         except: