[gentoo-commits] portage r9928 - in main/trunk: bin pym/portage/dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-04-20 20:50:48 +0000 (Sun, 20 Apr 2008)
New Revision: 9928

Modified:
   main/trunk/bin/portageq
   main/trunk/pym/portage/dbapi/porttree.py
Log:
Bug #218559 - Make portdbapi automatically add sandbox write access to
self.depcachedir when appropriate. This makes the portageq blanket sandbox
exemption unnecessary.


Modified: main/trunk/bin/portageq
===================================================================
--- main/trunk/bin/portageq	2008-04-19 13:12:11 UTC (rev 9927)
+++ main/trunk/bin/portageq	2008-04-20 20:50:48 UTC (rev 9928)
@@ -21,10 +21,6 @@
 
 import os
 
-# This allows portageq to be exempt from sandbox,
-# for things like updating metadata cache.
-os.environ["SANDBOX_ON"] = "0"
-
 import types
 
 #-----------------------------------------------------------------------------

Modified: main/trunk/pym/portage/dbapi/porttree.py
===================================================================
--- main/trunk/pym/portage/dbapi/porttree.py	2008-04-19 13:12:11 UTC (rev 9927)
+++ main/trunk/pym/portage/dbapi/porttree.py	2008-04-20 20:50:48 UTC (rev 9928)
@@ -62,8 +62,17 @@
 		#self.root=settings["PORTDIR"]
 		self.porttree_root = os.path.realpath(porttree_root)
 
-		self.depcachedir = self.mysettings.depcachedir[:]
+		self.depcachedir = os.path.realpath(self.mysettings.depcachedir)
 
+		if os.environ.get("SANDBOX_ON") == "1":
+			# Make api consumers exempt from sandbox violations
+			# when doing metadata cache updates.
+			sandbox_write = os.environ.get("SANDBOX_WRITE", "").split(":")
+			if self.depcachedir not in sandbox_write:
+				sandbox_write.append(self.depcachedir)
+				os.environ["SANDBOX_WRITE"] = \
+					":".join(filter(None, sandbox_write))
+
 		self.eclassdb = eclass_cache.cache(self.porttree_root,
 			overlays=self.mysettings["PORTDIR_OVERLAY"].split())
 

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