diff -ru -x '*~' nova-2011.2-orig//bin/nova-manage nova-2011.2//bin/nova-manage
--- nova-2011.2-orig//bin/nova-manage	2011-04-15 04:57:52.000000000 +0200
+++ nova-2011.2//bin/nova-manage	2011-06-09 18:28:39.063299654 +0200
@@ -1009,7 +1009,7 @@
         if (FLAGS.image_service == 'nova.image.local.LocalImageService'
             and directory == os.path.abspath(FLAGS.images_path)):
             new_dir = "%s_bak" % directory
-            os.move(directory, new_dir)
+            os.rename(directory, new_dir)
             os.mkdir(directory)
             directory = new_dir
         for fn in glob.glob("%s/*/info.json" % directory):