diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-07-29 10:29:59 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-07-29 10:29:59 +0000 |
commit | 428efdb7ac7592f3e6f57bf390bc76ff9bb8c88f (patch) | |
tree | 78fcd6fa35640b54385f8fe6d00b1b04f9cb4a2f | |
parent | d58e2779398ac543d5233e36923acac6a5281a58 (diff) | |
download | portage-428efdb7ac7592f3e6f57bf390bc76ff9bb8c88f.tar.gz portage-428efdb7ac7592f3e6f57bf390bc76ff9bb8c88f.tar.bz2 portage-428efdb7ac7592f3e6f57bf390bc76ff9bb8c88f.zip |
In apply_recursive_permissions(), ignore InvalidLocation exceptions such as
FileNotFound and DirectoryNotFound since sometimes things disappear, like
when adjusting permissions on DISTCC_DIR.
svn path=/main/trunk/; revision=11260
-rw-r--r-- | pym/portage/util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/portage/util.py b/pym/portage/util.py index d7aa7e949..177a6db9c 100644 --- a/pym/portage/util.py +++ b/pym/portage/util.py @@ -800,8 +800,12 @@ def apply_recursive_permissions(top, uid=-1, gid=-1, if not applied: all_applied = False except PortageException, e: - all_applied = False - onerror(e) + # Ignore InvalidLocation exceptions such as FileNotFound + # and DirectoryNotFound since sometimes things disappear, + # like when adjusting permissions on DISTCC_DIR. + if not isinstance(e, portage.exception.InvalidLocation): + all_applied = False + onerror(e) return all_applied def apply_secpass_permissions(filename, uid=-1, gid=-1, mode=-1, mask=-1, |