summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pym/portage/__init__.py28
1 files changed, 28 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c98fee11..db580c47 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4723,6 +4723,34 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
writemsg("does not exist. Please create this directory or " + \
"correct your PORTAGE_TMPDIR setting.\n", noiselevel=-1)
return 1
+
+ # 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(mysettings["PORTAGE_TMPDIR"], "portage")):
+ checkdir = os.path.join(mysettings["PORTAGE_TMPDIR"], "portage")
+ else:
+ checkdir = mysettings["PORTAGE_TMPDIR"]
+
+ if not os.access(checkdir, os.W_OK):
+ writemsg("%s is not writable.\n" % checkdir + \
+ "Likely cause is that you've mounted it as readonly.\n" \
+ , noiselevel=-1)
+ return 1
+ else:
+ from tempfile import NamedTemporaryFile
+ fd = NamedTemporaryFile(prefix="exectest-", dir=checkdir)
+ os.chmod(fd.name, 0755)
+ if not os.access(fd.name, os.X_OK):
+ writemsg("Can not execute files in %s\n" % checkdir + \
+ "Likely cause is that you've mounted it with one of the\n" + \
+ "following mount options: 'noexec', 'user', 'users'\n\n" + \
+ "Please make sure that portage can execute files in this direxctory.\n" \
+ , noiselevel=-1)
+ fd.close()
+ return 1
+ fd.close()
+ del checkdir
if mydo == "unmerge":
return unmerge(mysettings["CATEGORY"],