diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-04-08 19:36:54 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-04-08 19:36:54 +0000 |
commit | ca9d2d3b0793f4baac2b8a6e90d4d95ced47663b (patch) | |
tree | 0fdc55cbde5a210846d4fdb31eaef01cb5832bfc | |
parent | ee4d73a83c5c224cbc41fb9612ad68fcc717645e (diff) | |
download | portage-ca9d2d3b0793f4baac2b8a6e90d4d95ced47663b.tar.gz portage-ca9d2d3b0793f4baac2b8a6e90d4d95ced47663b.tar.bz2 portage-ca9d2d3b0793f4baac2b8a6e90d4d95ced47663b.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.
svn path=/main/trunk/; revision=6354
-rw-r--r-- | pym/portage/__init__.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 3e09e9992..072262a31 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3219,12 +3219,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 @@ -3241,11 +3241,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, |