To ease transition while Manifest 1 is being removed, only require hashes that will...

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

diff --git a/pym/portage.py b/pym/portage.py
index c8c635f96b07ac34f43dddd259d2e7ef9fb857e9..6eaf919dddb5f96b510b22170d0146c4aa6d3fa4 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2702,10 +2702,12 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
                                distfiles_map.setdefault(myfile, []).append(cpv)
                mf = Manifest(mysettings["O"], mysettings["DISTDIR"],
                        fetchlist_dict=fetchlist_dict)
-               required_hash_types = set(portage_const.MANIFEST1_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)
+               # Don't require all hashes since that can trigger excessive
+               # fetches when sufficient digests already exist.  To ease transition
+               # while Manifest 1 is being removed, only require hashes that will
+               # exist before and after the transition.
+               required_hash_types = set(portage_const.MANIFEST1_HASH_FUNCTIONS
+                       ).intersection(portage_const.MANIFEST2_HASH_FUNCTIONS)
                required_hash_types.add("size")
                dist_hashes = mf.fhashdict.get("DIST", {})
                missing_hashes = set()