From 24e1ae64bc76f5ca54a804057d565e9301be1346 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 18 Apr 2008 01:43:36 +0000 Subject: 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 --- pym/portage/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index f9a9e5d11..edb50fb3f 100644 --- 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: -- cgit v1.2.3-1-g7c22