From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 22 Sep 2006 21:49:22 +0000 (-0000)
Subject: Use finally: to ensure that the file is closed properly.
X-Git-Tag: v2.1.1-r1~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c334dbe1e9e64fcb60d7a2721f4288be778c9793;p=portage.git

Use finally: to ensure that the file is closed properly.

svn path=/main/trunk/; revision=4504
---

diff --git a/pym/cache/flat_hash.py b/pym/cache/flat_hash.py
index db46b0878..90c785f34 100644
--- a/pym/cache/flat_hash.py
+++ b/pym/cache/flat_hash.py
@@ -22,16 +22,17 @@ class database(fs_template.FsBased):
 
 	def __getitem__(self, cpv):
 		fp = os.path.join(self.location, cpv)
-		myf = None
 		try:
-			myf = open(fp,"r")
-			d = self._parse_data(myf, cpv)
-			d["_mtime_"] = long(os.fstat(myf.fileno()).st_mtime)
-			myf.close()
-			return d
+			myf = None
+			try:
+				myf = open(fp,"r")
+				d = self._parse_data(myf, cpv)
+				d["_mtime_"] = long(os.fstat(myf.fileno()).st_mtime)
+				return d
+			finally:
+				if myf:
+					myf.close()
 		except (IOError, OSError), e:
-			if myf:
-				myf.close()
 			if e.errno != errno.ENOENT:
 				raise cache_errors.CacheCorruption(cpv, e)
 			raise KeyError(cpv)