From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 3 Dec 2007 20:57:54 +0000 (-0000)
Subject: Bug #201090 - When portage creates a temp PORTAGE_BIN_PATH, put it
X-Git-Tag: v2.1.4~141
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c2dc638468766e36db8318ed3cd1f4af9cf1365;p=portage.git

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 6582a3738..b23cf0472 100644
--- 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