From c2e9e2f37804e1fe55830e221df584844c5390f2 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Fri, 21 Dec 2012 09:33:22 -0800 Subject: [PATCH] Fix typo in image_utils tempfile handling Commit cbcd340 changed from NamedTemporaryFile to mkstemp, but mkstemp returns a file descripter, not a file object. We therefore need to close the fd using os.close(). This was tested using devstack. Change-Id: I808fa470a141e249fe30ee762ee94f47ecfd3f63 --- cinder/image/image_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py index 8f1251f17..f0d947f12 100644 --- a/cinder/image/image_utils.py +++ b/cinder/image/image_utils.py @@ -209,7 +209,7 @@ def fetch_to_raw(context, image_service, os.makedirs(FLAGS.image_conversion_dir) fd, tmp = tempfile.mkstemp(dir=FLAGS.image_conversion_dir) - fd.close() + os.close(fd) with utils.remove_path_on_error(tmp): fetch(context, image_service, image_id, tmp, user_id, project_id) -- 2.45.2