diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-04-08 19:37:13 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-04-08 19:37:13 +0000 |
commit | 2552e4fe5e2bb58fda08fdeffbca278c26ed7a1a (patch) | |
tree | 694356c6ed645bfe694561d041522b7d1cf68343 | |
parent | d2acc63da753352954834f3ac9ad73fd3889b80e (diff) | |
download | portage-2552e4fe5e2bb58fda08fdeffbca278c26ed7a1a.tar.gz portage-2552e4fe5e2bb58fda08fdeffbca278c26ed7a1a.tar.bz2 portage-2552e4fe5e2bb58fda08fdeffbca278c26ed7a1a.zip |
Only apply permissions to ccache, confcache, and distcc dirs when they are created in order to avoid interference with whatever the user's preferred permissions are. Thanks to Diego Pettenò <flameeyes@gmail.com> for reporting. (trunk r6353:6354)
svn path=/main/branches/2.1.2/; revision=6355
-rw-r--r-- | pym/portage.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pym/portage.py b/pym/portage.py index 1847d8626..9ccd52c11 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3152,12 +3152,12 @@ def prepare_build_dirs(myroot, mysettings, cleanup): "confcache":{ "basedir_var":"CONFCACHE_DIR", "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "confcache"), - "always_recurse":True}, + "always_recurse":False}, "distcc":{ "basedir_var":"DISTCC_DIR", "default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"), "subdirs":("lock", "state"), - "always_recurse":True} + "always_recurse":False} } dirmode = 02070 filemode = 060 @@ -3174,11 +3174,10 @@ def prepare_build_dirs(myroot, mysettings, cleanup): for subdir in kwargs["subdirs"]: mydirs.append(os.path.join(basedir, subdir)) for mydir in mydirs: - modified = portage_util.ensure_dirs(mydir, - gid=portage_gid, mode=dirmode, mask=modemask) - # To avoid excessive recursive stat calls, we trigger - # recursion when the top level directory does not initially - # match our permission requirements. + modified = portage_util.ensure_dirs(mydir) + # 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"]: if modified: writemsg("Adjusting permissions recursively: '%s'\n" % mydir, |