From a1c28495aa8d970df0c1afa4efac1d10bdb24825 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Thu, 2 Feb 2012 10:07:50 +0000 Subject: various cleanups No functional changes Change-Id: I19e118e6e0c47fccfe5a817e727f3ab27e26aa79 --- nova/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/utils.py') diff --git a/nova/utils.py b/nova/utils.py index e375f11e5..d2b747090 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -940,7 +940,7 @@ def cleanup_file_locks(): # reliably tell which sentinels refer to which lock in the # lockfile implementation. - if FLAGS.disable_process_locking: + if FLAGS.disable_process_locking: return hostname = socket.gethostname() @@ -1266,7 +1266,7 @@ def save_and_reraise_exception(): In some cases the exception context can be cleared, resulting in None being attempted to be reraised after an exception handler is run. This can happen when eventlet switches greenthreads or when running an - exception handler, code raises and catches and exception. In both + exception handler, code raises and catches an exception. In both cases the exception context will be cleared. To work around this, we save the exception state, run handler code, and -- cgit