From c297da4df91758b38df7bd7b73a118188fdde651 Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Thu, 2 Sep 2010 09:58:30 -0500 Subject: [PATCH] pass through the timeout for calls to lock_parent_directory --- swift/common/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/common/utils.py b/swift/common/utils.py index 0028581cb1..49813be668 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -442,7 +442,7 @@ def lock_parent_directory(filename, timeout=10): :param filename: file path of the parent directory to be locked :param timeout: timeout (in seconds) """ - return lock_path(os.path.dirname(filename)) + return lock_path(os.path.dirname(filename), timeout=timeout) def get_time_units(time_amount):