[gentoo-commits] portage r13469 - main/branches/2.1.6/pym/portage/env

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-04-30 07:00:12 +0000 (Thu, 30 Apr 2009)
New Revision: 13469

Modified:
   main/branches/2.1.6/pym/portage/env/loaders.py
Log:
Make RecursiveFileLoader skip hidden directories, and only use a single stat
call to check for existence and file type. (trunk r13298)

Modified: main/branches/2.1.6/pym/portage/env/loaders.py
===================================================================
--- main/branches/2.1.6/pym/portage/env/loaders.py	2009-04-30 06:59:53 UTC (rev 13468)
+++ main/branches/2.1.6/pym/portage/env/loaders.py	2009-04-30 07:00:12 UTC (rev 13469)
@@ -4,6 +4,7 @@
 # $Id$
 
 import os
+import stat
 
 class LoaderError(Exception):
 	
@@ -36,14 +37,18 @@
 	@rtype: list
 	@returns: List of files to process
 	"""
-	if not os.path.exists(filename):
+	try:
+		st = os.stat(filename)
+	except OSError:
 		return
-	elif os.path.isdir(filename):
+	if stat.S_ISDIR(st.st_mode):
 		for root, dirs, files in os.walk(filename):
-			if 'CVS' in dirs:
-				dirs.remove('CVS')
-			files = [f for f in files if not f.startswith('.') and not f.endswith('~')]
+			for d in list(dirs):
+				if d[:1] == '.' or d == 'CVS':
+					dirs.remove(d)
 			for f in files:
+				if f[:1] == '.' or f[-1:] == '~':
+					continue
 				yield os.path.join(root, f)
 	else:
 		yield filename