summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-13 21:27:30 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-13 21:27:30 +0000
commite0dfd9cd1ed4c93647c2be20d77d2c3734e24bab (patch)
tree3e985059a62488f24b0b644c9a11c8a8775c07d7 /pym
parent9428e019c30685c82db2449164b0028c5e633ede (diff)
downloadportage-e0dfd9cd1ed4c93647c2be20d77d2c3734e24bab.tar.gz
portage-e0dfd9cd1ed4c93647c2be20d77d2c3734e24bab.tar.bz2
portage-e0dfd9cd1ed4c93647c2be20d77d2c3734e24bab.zip
Use a new 'usersync' feature to control dropping of privileges for --sync,
since it's fairly common for people to have inconsistent permissions between $PORTDIR and contained files/directories. svn path=/main/trunk/; revision=12496
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 796275588..991cb2d85 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -12068,7 +12068,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
spawn_kwargs = {}
spawn_kwargs["env"] = settings.environ()
- if portage.data.secpass >= 2 and \
+ if 'usersync' in settings.features and \
+ portage.data.secpass >= 2 and \
(st.st_uid != os.getuid() and st.st_mode & 0700 or \
st.st_gid != os.getgid() and st.st_mode & 0070):
try: