Don't apply the sticky bits until we have a complete plan for bug #149062.

svn path=/main/trunk/; revision=4589

diff --git a/bin/emerge b/bin/emerge
index bd3ca3e2d625818a53b4094d85e560ca7a4a41f5..90c1778b165c019cbeaf661eb5fa32ff221d3803 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2030,7 +2030,7 @@ class MergeTask(object):
                                portage_util.ensure_dirs(
                                        os.path.dirname(pkgsettings["PORTAGE_BUILDDIR"]),
                                        uid=portage.portage_uid, gid=portage.portage_gid,
-                                       mode=01775)
+                                       mode=070, mask=0)
                                builddir_lock = None
                                try:
                                        builddir_lock = portage_locks.lockdir(

diff --git a/pym/portage.py b/pym/portage.py
index a1fb2aef3e03078ea0b8bcea4d57ce1e1ff99e0f..7a6db950558da48fce8c70d8da296ad737d33446 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2695,7 +2695,7 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
        try:
                portage_util.ensure_dirs(mysettings["BUILD_PREFIX"])
                portage_util.apply_secpass_permissions(mysettings["BUILD_PREFIX"],
-                       gid=portage_gid, uid=portage_uid, mode=01775)
+                       gid=portage_gid, uid=portage_uid, mode=070, mask=0)
                for dir_key in ("PORTAGE_BUILDDIR", "HOME", "PKG_LOGDIR", "T"):
                        """These directories don't necessarily need to be group writable.
                        However, the setup phase is commonly run as a privileged user prior
@@ -5799,7 +5799,7 @@ class dblink:
                                self.settings, 0, 0, self.vartree.dbapi)
                        portage_util.ensure_dirs(
                                os.path.dirname(self.settings["PORTAGE_BUILDDIR"]),
-                               uid=portage_uid, gid=portage_gid, mode=01775)
+                               uid=portage_uid, gid=portage_gid, mode=070, mask=0)
                builddir_lock = None
                try:
                        if myebuildpath:
@@ -6638,7 +6638,7 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
                myebuild = os.path.join(
                        infloc, os.path.basename(mytbz2)[:-4] + "ebuild")
                portage_util.ensure_dirs(os.path.dirname(builddir),
-                       uid=portage_uid, gid=portage_gid, mode=01775)
+                       uid=portage_uid, gid=portage_gid, mode=070, mask=0)
                builddir_lock = portage_locks.lockdir(builddir)
                try:
                        shutil.rmtree(builddir)