Merge lp:~jason-oldos/cloud-init/bug-1338614 into lp:~cloud-init-dev/cloud-init/trunk

[Jay Faulkner]

Fixes https://bugs.launchpad.net/cloud-init/+bug/1338614

[lp:~jason-oldos/cloud-init/bug-1338614]

1009. By Jay Faulkner on 2014-09-15

Remove pylint: lines

=== modified file 'cloudinit/config/cc_resizefs.py'
--- cloudinit/config/cc_resizefs.py	2014-09-08 16:50:22 +0000
+++ cloudinit/config/cc_resizefs.py	2014-09-15 22:10:49 +0000
@@ -162,8 +162,8 @@
         # Fork to a child that will run
         # the resize command
         util.fork_cb(
-            util.log_time(logfunc=log.debug, msg="backgrounded Resizing",
-                func=do_resize, args=(resize_cmd, log)))
+            util.log_time, logfunc=log.debug, msg="backgrounded Resizing",
+            func=do_resize, args=(resize_cmd, log))
     else:
         util.log_time(logfunc=log.debug, msg="Resizing",
             func=do_resize, args=(resize_cmd, log))
 
=== modified file 'cloudinit/util.py'
--- cloudinit/util.py	2014-08-26 19:53:41 +0000
+++ cloudinit/util.py	2014-09-15 22:10:49 +0000
@@ -191,12 +191,17 @@
     return fh
 
 
-def fork_cb(child_cb, *args):
+def fork_cb(child_cb, *args, **kwargs):
     fid = os.fork()
     if fid == 0:
         try:
+<<<<<<< TREE
             child_cb(*args)
             os._exit(0)
+=======
+            child_cb(*args, **kwargs)
+            os._exit(0)
+>>>>>>> MERGE-SOURCE
         except:
             logexc(LOG, "Failed forking and calling callback %s",
                    type_utils.obj_name(child_cb))