diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-01-21 07:22:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-21 07:22:54 +0000 |
| commit | 9cf61abbba2e86567b69684107f9e1da5f4a840b (patch) | |
| tree | 8428cd2548d2b420d4c82c2168957ee029d25c7c | |
| parent | Don't require MANIFEST2 hashes since that can trigger excessive fetches when ... (diff) | |
| download | portage-multirepo-9cf61abbba2e86567b69684107f9e1da5f4a840b.tar.gz portage-multirepo-9cf61abbba2e86567b69684107f9e1da5f4a840b.tar.bz2 portage-multirepo-9cf61abbba2e86567b69684107f9e1da5f4a840b.zip | |
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
| -rw-r--r-- | pym/portage.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py index 432227ca..7ead8732 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() |