From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 4 Jul 2008 10:15:37 +0000 (-0000)
Subject: Fix broken references to portage.exception.
X-Git-Tag: v2.2_rc2~215
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4471259b7e67b89e04e159edd010b82c26dc42b;p=portage.git

Fix broken references to portage.exception.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 091a04081..50aadc898 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -471,7 +471,6 @@ class vardbapi(dbapi):
 		try:
 			dir_list = os.listdir(cat_dir)
 		except EnvironmentError, e:
-			from portage.exception import PermissionDenied
 			if e.errno == PermissionDenied.errno:
 				raise PermissionDenied(cat_dir)
 			del e
@@ -532,7 +531,7 @@ class vardbapi(dbapi):
 					if catpkgsplit(subpath) is None:
 						self.invalidentry(os.path.join(self.root, subpath))
 						continue
-				except portage.exception.InvalidData:
+				except InvalidData:
 					self.invalidentry(os.path.join(self.root, subpath))
 					continue
 				returnme.append(subpath)
@@ -546,7 +545,7 @@ class vardbapi(dbapi):
 				y = y[1:]
 			try:
 				mysplit = catpkgsplit(y)
-			except portage.exception.InvalidData:
+			except InvalidData:
 				self.invalidentry(self.getpath(y))
 				continue
 			if not mysplit: