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

by skipping permission checks on files and just checking the directories.
(trunk r9922)

svn path=/main/branches/2.1.2/; revision=9923

diff --git a/pym/portage.py b/pym/portage.py
index 2ded6dce1d901c765e63699b0af6faa244f4f00f..44f7e212ab1b04c03848010bcd73fae4593af84e 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4265,9 +4265,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: