Merge lp:~cbehrens/nova/bug614090 into lp:~hudson-openstack/nova/trunk

[Chris Behrens]

Change nova/virt/images.py's _fetch_local_image to accept 4 args, since fetch() tries to call it with that many.

Change nova/virt/images.py's _fetch_local_image to accept 4 args, since fetch() tries to call it with that many.

[Vish Ishaya (vishvananda)]

This looks fine, although this code is all fixed and changed in ewan's branch. Perhaps we can just merge that one?

lp:~ewanmellor/nova/xenapi

[Vish Ishaya (vishvananda)]

review: Approve

=== modified file 'nova/virt/images.py'
--- nova/virt/images.py	2010-07-30 22:19:41 +0000
+++ nova/virt/images.py	2010-08-05 23:31:06 +0000
@@ -65,7 +65,7 @@
     cmd += ['-o', path]
     return process.SharedPool().execute(executable=cmd[0], args=cmd[1:])
 
-def _fetch_local_image(image, path, _):
+def _fetch_local_image(image, path, user, project):
     source = _image_path('%s/image' % image)
     return process.simple_execute('cp %s %s' % (source, path))