diff options
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/__init__.py | 11 | ||||
| -rw-r--r-- | pym/portage/exception.py | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 31f2f091c..f5a4893c1 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -185,7 +185,14 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli mtime = pathstat[stat.ST_MTIME] else: raise portage.exception.DirectoryNotFound(mypath) - except (IOError,OSError,portage.exception.PortageException): + except EnvironmentError, e: + if e.errno == portage.exception.PermissionDenied.errno: + raise portage.exception.PermissionDenied(mypath) + del e + if EmptyOnError: + return [], [] + return None, None + except portage.exception.PortageException: if EmptyOnError: return [], [] return None, None @@ -199,8 +206,6 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli if e.errno != errno.EACCES: raise del e - if EmptyOnError: - return [], [] raise portage.exception.PermissionDenied(mypath) ftype = [] for x in list: diff --git a/pym/portage/exception.py b/pym/portage/exception.py index 4be72cf96..3d590a563 100644 --- a/pym/portage/exception.py +++ b/pym/portage/exception.py @@ -53,6 +53,7 @@ class OperationNotPermitted(PortageException): """An operation was not permitted operating system""" class PermissionDenied(PortageException): + from errno import EACCES as errno """Permission denied""" class ReadOnlyFileSystem(PortageException): |