From: John Griffith <john.griffith@solidfire.com>
Date: Tue, 26 Mar 2013 16:19:47 +0000 (-0600)
Subject: Sync lockutils from oslo-incubator stable/grizzly.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=649e8926cf6a6ee1cc01a34e6f718e0996feb930;p=openstack-build%2Fcinder-build.git

Sync lockutils from oslo-incubator stable/grizzly.

Changes include:

3cb71ff Locking edge case when lock_path does not exist
21925b6 Fix locking issues in Windows
547ab34 Fix Copyright Headers - Rename LLC to Foundation

Fix bug 1158179.

Change-Id: I0d5fb58bef593233068accfcea0dff9fa05f61ef
---

diff --git a/cinder/openstack/common/lockutils.py b/cinder/openstack/common/lockutils.py
index f5d260c21..0c6b26c41 100644
--- a/cinder/openstack/common/lockutils.py
+++ b/cinder/openstack/common/lockutils.py
@@ -207,7 +207,6 @@ def synchronized(name, lock_file_prefix, external=False, lock_path=None):
                             local_lock_path = tempfile.mkdtemp()
 
                         if not os.path.exists(local_lock_path):
-                            cleanup_dir = True
                             fileutils.ensure_tree(local_lock_path)
 
                         # NOTE(mikal): the lock name cannot contain directory