From 92017be236bfd3a15f3fbdd03272ac83e1f24b1e Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 9 Jun 2008 14:20:45 +0000
Subject: [PATCH] Add vardbapi.aux_get() support for an "_mtime_" value which
 corresponds to the installed package directory's mtime (numeric value from
 stat result). This value can be used to validate indexes or caches used in
 the optimization of vdb query operations for various types of package
 metadata such as dependencies and file contents. (trunk r10586)

svn path=/main/branches/2.1.2/; revision=10610
---
 pym/portage.py | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pym/portage.py b/pym/portage.py
index 9abbc53af..97eddec57 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7100,7 +7100,7 @@ class vardbapi(dbapi):
 		mydir_mtime = long(mydir_stat.st_mtime)
 		pkg_data = self._aux_cache["packages"].get(mycpv)
 		pull_me = cache_these.union(wants)
-		mydata = {}
+		mydata = {"_mtime_" : mydir_mtime}
 		cache_valid = False
 		cache_incomplete = False
 		cache_mtime = None
@@ -7124,7 +7124,8 @@ class vardbapi(dbapi):
 		if pull_me:
 			# pull any needed data and cache it
 			aux_keys = list(pull_me)
-			for k, v in izip(aux_keys, self._aux_get(mycpv, aux_keys)):
+			for k, v in izip(aux_keys,
+				self._aux_get(mycpv, aux_keys, st=mydir_stat)):
 				mydata[k] = v
 			if not cache_valid or cache_these.difference(metadata):
 				cache_data = {}
@@ -7136,18 +7137,25 @@ class vardbapi(dbapi):
 				self._aux_cache["modified"].add(mycpv)
 		return [mydata[x] for x in wants]
 
-	def _aux_get(self, mycpv, wants):
+	def _aux_get(self, mycpv, wants, st=None):
 		mydir = os.path.join(self.root, VDB_PATH, mycpv)
-		try:
-			if not stat.S_ISDIR(os.stat(mydir).st_mode):
-				raise KeyError(mycpv)
-		except OSError, e:
-			if e.errno == errno.ENOENT:
-				raise KeyError(mycpv)
-			del e
-			raise
+		if st is None:
+			try:
+				st = os.stat(mydir)
+			except OSError, e:
+				if e.errno == errno.ENOENT:
+					raise KeyError(mycpv)
+				elif e.errno == portage_exception.PermissionDenied.errno:
+					raise portage_exception.PermissionDenied(mydir)
+				else:
+					raise
+		if not stat.S_ISDIR(st.st_mode):
+			raise KeyError(mycpv)
 		results = []
 		for x in wants:
+			if x == "_mtime_":
+				results.append(st.st_mtime)
+				continue
 			try:
 				myf = open(os.path.join(mydir, x), "r")
 				try:
-- 
2.26.2