summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-03 20:57:54 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-03 20:57:54 +0000
commit0c2dc638468766e36db8318ed3cd1f4af9cf1365 (patch)
tree078becd753bfd74636dc27397cc9637c43cc4ba7 /pym
parentfe346e9223f51368144c6f83154f8fcdb85117e6 (diff)
downloadportage-0c2dc638468766e36db8318ed3cd1f4af9cf1365.tar.gz
portage-0c2dc638468766e36db8318ed3cd1f4af9cf1365.tar.bz2
portage-0c2dc638468766e36db8318ed3cd1f4af9cf1365.zip
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
Diffstat (limited to 'pym')
-rw-r--r--pym/portage.py5
1 files changed, 4 insertions, 1 deletions
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