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

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

diff --git a/pym/portage.py b/pym/portage.py
index 69ba15cfc1fa8d852509671f40b94808b2150e34..c8c635f96b07ac34f43dddd259d2e7ef9fb857e9 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2703,7 +2703,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()