diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-01-10 23:02:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-01-10 23:02:01 +0000 |
| commit | e16c2406ac014193aaab326edcfc7d16e0e8b29b (patch) | |
| tree | b0569215d15627df8a6fc7ea31c45f0dc91295b7 | |
| parent | 7d3b31bca09627ea348a0938e9746afe68332e87 (diff) | |
| download | portage-e16c2406ac014193aaab326edcfc7d16e0e8b29b.tar.gz portage-e16c2406ac014193aaab326edcfc7d16e0e8b29b.tar.bz2 portage-e16c2406ac014193aaab326edcfc7d16e0e8b29b.zip | |
Bug #162542 - When dropping privileges for FEATURES=userpriv,
automatically detect permission problems with CCACHE_DIR and
recursively adjust permissions only when necessary.
svn path=/main/trunk/; revision=9160
| -rw-r--r-- | pym/portage/__init__.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index c56286069..4a9283ab2 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4067,6 +4067,11 @@ def prepare_build_dirs(myroot, mysettings, cleanup): dirmode = 02070 filemode = 060 modemask = 02 + restrict = mysettings.get("PORTAGE_RESTRICT","").split() + from portage.data import secpass + droppriv = secpass >= 2 and \ + "userpriv" in mysettings.features and \ + "userpriv" not in restrict for myfeature, kwargs in features_dirs.iteritems(): if myfeature in mysettings.features: basedir = mysettings[kwargs["basedir_var"]] @@ -4083,7 +4088,13 @@ def prepare_build_dirs(myroot, mysettings, cleanup): # Generally, we only want to apply permissions for # initial creation. Otherwise, we don't know exactly what # permissions the user wants, so should leave them as-is. - if modified or kwargs["always_recurse"]: + droppriv_fix = False + if droppriv: + st = os.stat(mydir) + if st.st_gid != portage_gid or \ + not stat.S_IMODE(st.st_mode) & dirmode: + droppriv_fix = True + if modified or kwargs["always_recurse"] or droppriv_fix: if modified: writemsg("Adjusting permissions recursively: '%s'\n" % mydir, noiselevel=-1) |