Don't require MANIFEST2 hashes since that can trigger excessive fetches when sufficie...

svn path=/main/branches/2.1.2/; revision=5745

diff --git a/pym/portage.py b/pym/portage.py
index a4855269c806bdfc6922af1a0f7b9a0b152bd3ce..432227ca7d0f0f4faba2f1bf59847f153fd8da82 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2677,7 +2677,9 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
                mf = Manifest(mysettings["O"], mysettings["DISTDIR"],
                        fetchlist_dict=fetchlist_dict)
                required_hash_types = set(portage_const.MANIFEST1_HASH_FUNCTIONS)
-               required_hash_types.update(portage_const.MANIFEST2_HASH_FUNCTIONS)
+               # Don't require MANIFEST2 hashes since that can trigger excessive
+               # fetches when sufficient digests already exist.
+               #required_hash_types.update(portage_const.MANIFEST2_HASH_FUNCTIONS)
                required_hash_types.add("size")
                dist_hashes = mf.fhashdict.get("DIST", {})
                missing_hashes = set()