1 |
Author: zmedico |
2 |
Date: 2008-07-29 10:29:59 +0000 (Tue, 29 Jul 2008) |
3 |
New Revision: 11260 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/util.py |
7 |
Log: |
8 |
In apply_recursive_permissions(), ignore InvalidLocation exceptions such as |
9 |
FileNotFound and DirectoryNotFound since sometimes things disappear, like |
10 |
when adjusting permissions on DISTCC_DIR. |
11 |
|
12 |
|
13 |
Modified: main/trunk/pym/portage/util.py |
14 |
=================================================================== |
15 |
--- main/trunk/pym/portage/util.py 2008-07-29 07:15:22 UTC (rev 11259) |
16 |
+++ main/trunk/pym/portage/util.py 2008-07-29 10:29:59 UTC (rev 11260) |
17 |
@@ -800,8 +800,12 @@ |
18 |
if not applied: |
19 |
all_applied = False |
20 |
except PortageException, e: |
21 |
- all_applied = False |
22 |
- onerror(e) |
23 |
+ # Ignore InvalidLocation exceptions such as FileNotFound |
24 |
+ # and DirectoryNotFound since sometimes things disappear, |
25 |
+ # like when adjusting permissions on DISTCC_DIR. |
26 |
+ if not isinstance(e, portage.exception.InvalidLocation): |
27 |
+ all_applied = False |
28 |
+ onerror(e) |
29 |
return all_applied |
30 |
|
31 |
def apply_secpass_permissions(filename, uid=-1, gid=-1, mode=-1, mask=-1, |