From d27ccd5eb96aa5d526709de11cff7c9191d6033f Mon Sep 17 00:00:00 2001
From: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
Date: Wed, 11 Mar 2009 10:05:09 -0400
Subject: [PATCH] workdir: cleanup after ourselves if branch -d fails

This may happen in the case of a leaf branch
---
 plugins/workdir.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/workdir.py b/plugins/workdir.py
index 51acd1b..a2b51ab 100644
--- a/plugins/workdir.py
+++ b/plugins/workdir.py
@@ -118,10 +118,11 @@ class WorkdirPlugin(YapCore):
 	else:
 	    branch = None
 
-	super(WorkdirPlugin, self).cmd_branch(*args, **flags)
-
-	if branch:
-	    self._unlock_branch(branch)
+	try:
+	    super(WorkdirPlugin, self).cmd_branch(*args, **flags)
+	finally:
+	    if branch:
+		self._unlock_branch(branch)
 
     def cmd_switch(self, branch, *args, **flags):
         self._check_git()
-- 
2.11.4.GIT