Namespace sanitizing, step 1

svn path=/main/trunk/; revision=5778

1 files changed, 1 insertions, 83 deletions

diff --git a/pym/eclass_cache.py b/pym/eclass_cache.py
index 91b98fec5..c7d7db2ca 100644..120000
--- a/pym/eclass_cache.py
+++ b/pym/eclass_cache.py
@@ -1,83 +1 @@
-# Copyright: 2005 Gentoo Foundation
-# Author(s): Nicholas Carpaski (carpaski@gentoo.org), Brian Harring (ferringb@gentoo.org)
-# License: GPL2
-# $Id$
-
-from portage_util import normalize_path, writemsg
-import os, sys
-from portage_data import portage_gid
-
-class cache:
-	"""
-	Maintains the cache information about eclasses used in ebuild.
-	"""
-	def __init__(self, porttree_root, overlays=[]):
-		self.porttree_root = porttree_root
-
-		self.eclasses = {} # {"Name": ("location","_mtime_")}
-		self._eclass_locations = {}
-
-		# screw with the porttree ordering, w/out having bash inherit match it, and I'll hurt you.
-		# ~harring
-		self.porttrees = [self.porttree_root]+overlays
-		self.porttrees = tuple(map(normalize_path, self.porttrees))
-		self._master_eclass_root = os.path.join(self.porttrees[0],"eclass")
-		self.update_eclasses()
-
-	def close_caches(self):
-		import traceback
-		traceback.print_stack()
-		print "%s close_cache is deprecated" % self.__class__
-		self.eclasses.clear()
-
-	def flush_cache(self):
-		import traceback
-		traceback.print_stack()
-		print "%s flush_cache is deprecated" % self.__class__
-
-		self.update_eclasses()
-
-	def update_eclasses(self):
-		self.eclasses = {}
-		self._eclass_locations = {}
-		eclass_len = len(".eclass")
-		for x in [normalize_path(os.path.join(y,"eclass")) for y in self.porttrees]:
-			if not os.path.isdir(x):
-				continue
-			for y in [y for y in os.listdir(x) if y.endswith(".eclass")]:
-				try:
-					mtime = long(os.stat(os.path.join(x, y)).st_mtime)
-				except OSError:
-					continue
-				ys=y[:-eclass_len]
-				self.eclasses[ys] = (x, long(mtime))
-				self._eclass_locations[ys] = x
-	
-	def is_eclass_data_valid(self, ec_dict):
-		if not isinstance(ec_dict, dict):
-			return False
-		for eclass, tup in ec_dict.iteritems():
-			cached_data = self.eclasses.get(eclass, None)
-			""" Only use the mtime for validation since the probability of a
-			collision is small and, depending on the cache implementation, the
-			path may not be specified (cache from rsync mirrors, for example).
-			"""
-			if cached_data is None or tup[1] != cached_data[1]:
-				return False
-
-		return True
-
-	def get_eclass_data(self, inherits, from_master_only=False):
-		ec_dict = {}
-		for x in inherits:
-			try:
-				ec_dict[x] = self.eclasses[x]
-			except KeyError:
-				print "ec=",ec_dict
-				print "inherits=",inherits
-				raise
-			if from_master_only and \
-				self._eclass_locations[x] != self._master_eclass_root:
-				return None
-
-		return ec_dict
+portage/eclass_cache.py
\ No newline at end of file