Rev 2573: Don't fail hard when removing pending lockdir in http://sourcefrog.net/bzr/dlock

[Martin Pool]

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

------------------------------------------------------------
revno: 2573
revision-id: mbp at sourcefrog.net-20070703092445-lxrbtbwncyyolqgz
parent: mbp at sourcefrog.net-20070703092317-7uf5ftvnu268m4ls
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dlock
timestamp: Tue 2007-07-03 19:24:45 +1000
message:
  Don't fail hard when removing pending lockdir
modified:
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
=== modified file 'bzrlib/lockdir.py'
--- a/bzrlib/lockdir.py	2007-07-03 09:23:17 +0000
+++ b/bzrlib/lockdir.py	2007-07-03 09:24:45 +0000
@@ -249,8 +249,11 @@
         dirs don't clutter up the lockdir.
         """
         self._trace("remove %s", tmpname)
-        self.transport.delete(tmpname + self.__INFO_NAME)
-        self.transport.rmdir(tmpname)
+        try:
+            self.transport.delete(tmpname + self.__INFO_NAME)
+            self.transport.rmdir(tmpname)
+        except PathError, e:
+            note("error removing pending lock: %s", e)
 
     def _create_pending_dir(self):
         tmpname = '%s/%s.tmp' % (self.path, rand_chars(10))