Mercurial > hg

changeset 16194:6ba530122d8b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: restore python 2.4 compatibility Remove py25 'try except finally' clause.
author Gilles Moris <gilles.moris@free.fr>
date Wed, 29 Feb 2012 09:34:19 +0100
parents b468cea3f29d
children 40cc20042fb4
files mercurial/bookmarks.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Wed Feb 29 17:43:03 2012 +0000
+++ b/mercurial/bookmarks.py	Wed Feb 29 09:34:19 2012 +0100
@@ -129,11 +129,12 @@
 def unsetcurrent(repo):
     wlock = repo.wlock()
     try:
-        util.unlink(repo.join('bookmarks.current'))
-        repo._bookmarkcurrent = None
-    except OSError, inst:
-        if inst.errno != errno.ENOENT:
-            raise
+        try:
+            util.unlink(repo.join('bookmarks.current'))
+            repo._bookmarkcurrent = None
+        except OSError, inst:
+            if inst.errno != errno.ENOENT:
+                raise
     finally:
         wlock.release()