From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 14 Sep 2010 23:40:13 +0000 (-0700)
Subject: Make IpcDaemonTestCase use a finally block to unlock PORTAGE_BUILDDIR.
X-Git-Tag: v2.2_rc82
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d3b4759b419fb4973d9f43c4a58ed7e8f8d7814;p=portage.git

Make IpcDaemonTestCase use a finally block to unlock PORTAGE_BUILDDIR.
---

diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py
index 4c9a614f8..b5b4796e1 100644
--- a/pym/portage/tests/ebuild/test_ipc_daemon.py
+++ b/pym/portage/tests/ebuild/test_ipc_daemon.py
@@ -23,6 +23,7 @@ class IpcDaemonTestCase(TestCase):
 
 	def testIpcDaemon(self):
 		tmpdir = tempfile.mkdtemp()
+		build_dir = None
 		try:
 			env = {}
 
@@ -117,6 +118,7 @@ class IpcDaemonTestCase(TestCase):
 				self.assertEqual(daemon.isAlive(), False)
 				self.assertEqual(proc.returncode == os.EX_OK, False)
 
-			build_dir.unlock()
 		finally:
+			if build_dir is not None:
+				build_dir.unlock()
 			shutil.rmtree(tmpdir)