ferringb pointed out this portroot parameter, ended up not using it, try an os.path.exists to save a very common (and slow) except on missing repo_name files for overlays, use a dict to facility a nicer regex comparison loop for news restrictions.

svn path=/main/trunk/; revision=5662

1 files changed, 8 insertions, 9 deletions

diff --git a/pym/portage.py b/pym/portage.py
index 3cbe7114d..501f55685 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4527,13 +4527,10 @@ def getmaskingstatus(mycpv, settings=None, portdb=None):
 	return rValue
 
 class portagetree:
-	def __init__(self, root="/", virtual=None, clone=None, settings=None, portroot=None):
+	def __init__(self, root="/", virtual=None, clone=None, settings=None):
 		"""
 		Constructor for a PortageTree
 		
-		Note: Portroot was added for GLEP 42 functionality and defaults to the $PORTDIR
-		env variable.
-		
 		@param root: ${ROOT}, defaults to '/', see make.conf(5)
 		@type root: String/Path
 		@param virtual: UNUSED
@@ -5549,11 +5546,13 @@ class portdbapi(dbapi):
 			[os.path.realpath(t) for t in self.mysettings["PORTDIR_OVERLAY"].split()]
 		self.treemap = {}
 		for path in self.porttrees:
-			try:
-				repo_name = open( os.path.join( path , REPO_NAME_LOC ) ,'r').readline().rstrip()
-				self.treemap[repo_name] = path
-			except (OSError,IOError):
-				pass
+			repo_name_path = os.path.join( path, REPO_NAME_LOC )
+			if os.path.exists( repo_name_path ):
+				try:
+					repo_name = open( repo_name_path ,'r').readline().strip()
+					self.treemap[repo_name] = path
+				except (OSError,IOError):
+					pass
 		
 		self.auxdbmodule  = self.mysettings.load_best_module("portdbapi.auxdbmodule")
 		self.auxdb        = {}