_check_temp_dir: check for 'portage' symlink

This will fix bug #378403.

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 49b67aca0aa7c4f594a4ce39bf5ef5307c227861..a710e09e594c939b74a384cb0290acbff6ca2011 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -944,10 +944,31 @@ def _check_temp_dir(settings):
        # as some people use a separate PORTAGE_TMPDIR mount
        # we prefer that as the checks below would otherwise be pointless
        # for those people.
-       if os.path.exists(os.path.join(settings["PORTAGE_TMPDIR"], "portage")):
-               checkdir = os.path.join(settings["PORTAGE_TMPDIR"], "portage")
+       tmpdir = os.path.realpath(settings["PORTAGE_TMPDIR"])
+       if os.path.exists(os.path.join(tmpdir, "portage")):
+               checkdir = os.path.realpath(os.path.join(tmpdir, "portage"))
+               if ("sandbox" in settings.features or
+                       "usersandox" in settings.features) and \
+                       not checkdir.startswith(tmpdir + os.sep):
+                       msg = _("The 'portage' subdirectory of the directory "
+                       "referenced by the PORTAGE_TMPDIR variable appears to be "
+                       "a symlink. In order to avoid sandbox violations (see bug "
+                       "#378379), you must adjust PORTAGE_TMPDIR instead of using "
+                       "the symlink located at '%s'. A suitable PORTAGE_TMPDIR "
+                       "setting would be '%s'.") % \
+                       (os.path.join(tmpdir, "portage"), checkdir)
+                       lines = []
+                       lines.append("")
+                       lines.append("")
+                       lines.extend(wrap(msg, 72))
+                       lines.append("")
+                       for line in lines:
+                               if line:
+                                       line = "!!! %s" % (line,)
+                               writemsg("%s\n" % (line,), noiselevel=-1)
+                       return 1
        else:
-               checkdir = settings["PORTAGE_TMPDIR"]
+               checkdir = tmpdir
 
        if not os.access(checkdir, os.W_OK):
                writemsg(_("%s is not writable.\n"