summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-21 00:46:08 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-21 00:46:08 +0000
commit711594e428301006641f8ccee516d0cb283b6174 (patch)
tree5d2eae9728abe2679492b14258e48ed841f134f4
parentMinor fixes thanks to Fabio Correa <facorread@alexandria.cc> in bug #162647. ... (diff)
downloadportage-multirepo-711594e428301006641f8ccee516d0cb283b6174.tar.gz
portage-multirepo-711594e428301006641f8ccee516d0cb283b6174.tar.bz2
portage-multirepo-711594e428301006641f8ccee516d0cb283b6174.zip
Don't require MANIFEST2 hashes since that can trigger excessive fetches when sufficient digests already exist. Thanks to vapier for reporting. (trunk r5742:5743)
svn path=/main/branches/2.1.2/; revision=5745
-rw-r--r--pym/portage.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index a4855269..432227ca 100644
--- 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()