Rev 2561: Restore disabled LockDir trace message in http://sourcefrog.net/bzr/dlock

[Martin Pool]

At http://sourcefrog.net/bzr/dlock

------------------------------------------------------------
revno: 2561
revision-id: mbp at sourcefrog.net-20070627092240-c75i6lwuwnc5gf2l
parent: mbp at sourcefrog.net-20070627091722-ouf4om2ib0e4s7ft
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Wed 2007-06-27 19:22:40 +1000
message:
  Restore disabled LockDir trace message
modified:
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
=== modified file 'bzrlib/lockdir.py'
--- a/bzrlib/lockdir.py	2007-06-27 09:17:22 +0000
+++ b/bzrlib/lockdir.py	2007-06-27 09:22:40 +0000
@@ -231,7 +231,6 @@
             # safe on all platforms.
             # FIXME: we should remove the pending lock if we fail, 
             # https://bugs.launchpad.net/bzr/+bug/109169
-            return self.nonce
         except errors.PermissionDenied:
             self._trace("... lock failed, permission denied")
             raise
@@ -240,6 +239,7 @@
             raise LockContention(self)
         self._trace("... lock succeeded after %dms",
                 (time.time() - start_time) * 1000)
+        return self.nonce
 
     def unlock(self):
         """Release a held lock