cloud-init

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

  1. bug-1338614
  2. Merge into trunk
Proposed by Jay Faulkner
Status: Merged
Merged at revision: 1018
Proposed branch: lp:~jason-oldos/cloud-init/bug-1338614
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 37 lines (+8/-3) (has conflicts)
2 files modified
cloudinit/config/cc_resizefs.py (+2/-2)
cloudinit/util.py (+6/-1)
Text conflict in cloudinit/util.py
To merge this branch: bzr merge lp:~jason-oldos/cloud-init/bug-1338614
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+234749@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~jason-oldos/cloud-init/bug-1338614 updated
1009. By Jay Faulkner

Remove pylint: lines

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/config/cc_resizefs.py'
2--- cloudinit/config/cc_resizefs.py 2014-09-08 16:50:22 +0000
3+++ cloudinit/config/cc_resizefs.py 2014-09-15 22:10:49 +0000
4@@ -162,8 +162,8 @@
5 # Fork to a child that will run
6 # the resize command
7 util.fork_cb(
8- util.log_time(logfunc=log.debug, msg="backgrounded Resizing",
9- func=do_resize, args=(resize_cmd, log)))
10+ util.log_time, logfunc=log.debug, msg="backgrounded Resizing",
11+ func=do_resize, args=(resize_cmd, log))
12 else:
13 util.log_time(logfunc=log.debug, msg="Resizing",
14 func=do_resize, args=(resize_cmd, log))
15
16=== modified file 'cloudinit/util.py'
17--- cloudinit/util.py 2014-08-26 19:53:41 +0000
18+++ cloudinit/util.py 2014-09-15 22:10:49 +0000
19@@ -191,12 +191,17 @@
20 return fh
21
22
23-def fork_cb(child_cb, *args):
24+def fork_cb(child_cb, *args, **kwargs):
25 fid = os.fork()
26 if fid == 0:
27 try:
28+<<<<<<< TREE
29 child_cb(*args)
30 os._exit(0)
31+=======
32+ child_cb(*args, **kwargs)
33+ os._exit(0)
34+>>>>>>> MERGE-SOURCE
35 except:
36 logexc(LOG, "Failed forking and calling callback %s",
37 type_utils.obj_name(child_cb))