Bug #201090 - When portage creates a temp PORTAGE_BIN_PATH, put it

inside PORTAGE_TMPDIR since, unlike /tmp, it can't be mounted with
the "noexec" option. (trunk r8828)

svn path=/main/branches/2.1.2/; revision=8829

diff --git a/pym/portage.py b/pym/portage.py
index 6582a3738061b29630bb4def51a7b5e071533c7a..b23cf04724f2ef721e7e12463b14fc0a8182e752 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -9233,7 +9233,10 @@ class dblink:
                        base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"])
                        from tempfile import mkdtemp
                        import shutil
-                       base_path_tmp = mkdtemp()
+                       # Make the temp directory inside PORTAGE_TMPDIR since, unlike
+                       # /tmp, it can't be mounted with the "noexec" option.
+                       base_path_tmp = mkdtemp("", "._portage_reinstall_.",
+                               settings["PORTAGE_TMPDIR"])
                        from portage_exec import atexit_register
                        atexit_register(shutil.rmtree, base_path_tmp)
                        dir_perms = 0755