From 9f023581d3bb939f2f8369c9973889323b67dd5e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 19 Jun 2007 22:02:26 +0000 Subject: [PATCH] Fix cacheddir() to behave properly if os.listdir() raises errno.EACCES (Permission denied). (trunk r6879) svn path=/main/branches/2.1.2/; revision=6880 --- pym/portage.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pym/portage.py b/pym/portage.py index 7558a7b82..ea3fba2fa 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -193,7 +193,15 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli if mtime != cached_mtime or time.time() - mtime < 4: if dircache.has_key(mypath): cacheStale += 1 - list = os.listdir(mypath) + try: + list = os.listdir(mypath) + except EnvironmentError, e: + if e.errno != errno.EACCES: + raise + del e + if EmptyOnError: + return [], [] + raise portage_exception.PermissionDenied(mypath) ftype = [] for x in list: try: -- 2.26.2