summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/cache/metadata.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/cache/metadata.py b/pym/cache/metadata.py
index 1433ad489..1fb19b398 100644
--- a/pym/cache/metadata.py
+++ b/pym/cache/metadata.py
@@ -3,7 +3,7 @@
# License: GPL2
# $Id: metadata.py 1964 2005-09-03 00:16:16Z ferringb $
-import os, stat
+import os, stat, types
import flat_hash
import cache_errors
import eclass_cache
@@ -67,8 +67,10 @@ class database(flat_hash.database):
if "INHERITED" in d:
d["_eclasses_"] = self.ec.get_eclass_data(d["INHERITED"].split(), from_master_only=True)
del d["INHERITED"]
- else:
- d["_eclasses_"] = reconstruct_eclasses(cpv, d["_eclasses_"])
+ elif not isinstance(d["_eclasses_"], types.DictType):
+ # We skip this if flat_hash.database._parse_data() was called above
+ # because it calls reconstruct_eclasses() internally.
+ d["_eclasses_"] = reconstruct_eclasses(None, d["_eclasses_"])
return d