From: Zac Medico Date: Sun, 21 Jan 2007 07:22:54 +0000 (-0000) Subject: To ease transition while Manifest 1 is being removed, only require hashes that will... X-Git-Tag: v2.1.2-r2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cf61abbba2e86567b69684107f9e1da5f4a840b;p=portage.git To ease transition while Manifest 1 is being removed, only require hashes that will exist before and after the transition. (trunk r5746) svn path=/main/branches/2.1.2/; revision=5747 --- diff --git a/pym/portage.py b/pym/portage.py index 432227ca7..7ead87327 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2676,10 +2676,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()