From d0c5daf2ad6e830fd44a6548c10f64d4022f80da Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 18 Apr 2008 01:44:15 +0000 Subject: 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 --- pym/portage.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 2ded6dce1..44f7e212a 100644 --- 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: -- cgit v1.2.3-1-g7c22