summaryrefslogtreecommitdiffstats
path: root/pym/portage/eclass_cache.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/eclass_cache.py')
-rw-r--r--pym/portage/eclass_cache.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/pym/portage/eclass_cache.py b/pym/portage/eclass_cache.py
index 806505757..de20d307c 100644
--- a/pym/portage/eclass_cache.py
+++ b/pym/portage/eclass_cache.py
@@ -23,6 +23,7 @@ class cache(object):
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._master_eclasses_overridden = {}
self.update_eclasses()
def close_caches(self):
@@ -41,6 +42,7 @@ class cache(object):
def update_eclasses(self):
self.eclasses = {}
self._eclass_locations = {}
+ master_eclasses = {}
eclass_len = len(".eclass")
ignored_listdir_errnos = (errno.ENOENT, errno.ENOTDIR)
for x in [normalize_path(os.path.join(y,"eclass")) for y in self.porttrees]:
@@ -63,7 +65,13 @@ class cache(object):
ys=y[:-eclass_len]
self.eclasses[ys] = (x, long(mtime))
self._eclass_locations[ys] = x
-
+ if x == self._master_eclass_root:
+ master_eclasses[ys] = mtime
+ else:
+ master_mtime = master_eclasses.get(ys)
+ if master_mtime and master_mtime != mtime:
+ self._master_eclasses_overridden[ys] = x
+
def is_eclass_data_valid(self, ec_dict):
if not isinstance(ec_dict, dict):
return False