[gentoo-commits] portage r10076 - main/branches/2.1.2/pym

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-05-02 03:33:09 +0000 (Fri, 02 May 2008)
New Revision: 10076

Modified:
   main/branches/2.1.2/pym/portage.py
Log:
check if PORTAGE_TMPDIR is mounted readonly/noexec (bug #219957)
(trunk r10069)


Modified: main/branches/2.1.2/pym/portage.py
===================================================================
--- main/branches/2.1.2/pym/portage.py	2008-05-02 03:24:30 UTC (rev 10075)
+++ main/branches/2.1.2/pym/portage.py	2008-05-02 03:33:09 UTC (rev 10076)
@@ -4725,7 +4725,35 @@
 			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"],
 				mysettings["PF"], myroot, mysettings, vartree=vartree)

-- 
gentoo-commits@l.g.o mailing list