Make the ccache userpriv permission check from bug #162542 less sensitive

by skipping permission checks on files and just checking the directories.

svn path=/main/trunk/; revision=9922

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index f9a9e5d11707abde82b73a0d4fed309dee080a06..edb50fb3fd414aa72dd16044020b5fbe951c4e0c 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4263,9 +4263,7 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
                                                                        continue
                                                                if subdir_st.st_gid != portage_gid or \
                                                                        ((stat.S_ISDIR(subdir_st.st_mode) and \
-                                                                       not dirmode == (stat.S_IMODE(subdir_st.st_mode) & dirmode)) or \
-                                                                       (not stat.S_ISDIR(subdir_st.st_mode) and \
-                                                                       not filemode == (stat.S_IMODE(subdir_st.st_mode) & filemode))):
+                                                                       not dirmode == (stat.S_IMODE(subdir_st.st_mode) & dirmode))):
                                                                        droppriv_fix = True
                                                                        break
                                        if droppriv_fix: