[gentoo-commits] portage r14755 - main/trunk/pym/portage

[gentoo-commits] portage r14755 - main/trunk/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-10-31 19:15:54 +0000 (Sat, 31 Oct 2009)
New Revision: 14755

Modified:
   main/trunk/pym/portage/__init__.py
Log:
Make cacheddir() always behave like EmptyOnError is True, since listdir()
doesn't handle a None return value correctly.


Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2009-10-31 19:08:45 UTC (rev 14754)
+++ main/trunk/pym/portage/__init__.py	2009-10-31 19:15:54 UTC (rev 14755)
@@ -542,13 +542,9 @@
 		if e.errno == portage.exception.PermissionDenied.errno:
 			raise portage.exception.PermissionDenied(mypath)
 		del e
-		if EmptyOnError:
-			return [], []
-		return None, None
+		return [], []
 	except portage.exception.PortageException:
-		if EmptyOnError:
-			return [], []
-		return None, None
+		return [], []
 	# Python retuns mtime in seconds, so if it was changed in the last few seconds, it could be invalid
 	if mtime != cached_mtime or time.time() - mtime < 4:
 		if mypath in dircache:
@@ -615,7 +611,7 @@
 	@type ignorelist: List
 	@param followSymlinks: Follow Symlink'd files and directories
 	@type followSymlinks: Boolean
-	@param EmptyOnError: Return [] if an error occurs.
+	@param EmptyOnError: Return [] if an error occurs (deprecated, always True)
 	@type EmptyOnError: Boolean
 	@param dirsonly: Only return directories.
 	@type dirsonly: Boolean