summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-18 01:43:36 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-18 01:43:36 +0000
commit24e1ae64bc76f5ca54a804057d565e9301be1346 (patch)
treea0465a986870e853d3fe1eb1596cc7bff30a9883
parenta9b69e9465e550da17f424843345f7e4d11a5232 (diff)
downloadportage-24e1ae64bc76f5ca54a804057d565e9301be1346.tar.gz
portage-24e1ae64bc76f5ca54a804057d565e9301be1346.tar.bz2
portage-24e1ae64bc76f5ca54a804057d565e9301be1346.zip
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
-rw-r--r--pym/portage/__init__.py4
1 files changed, 1 insertions, 3 deletions
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: