summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-06-26 22:38:17 +0000
committerZac Medico <zmedico@gentoo.org>2007-06-26 22:38:17 +0000
commitf84f2b119113b076964f632e5bf4d5414b4ec7ed (patch)
treee468eb75c9c3d5c12d06e97f56589d65bb410a0d
parentb67106b924ea060ba3eaa446ec4d3156c7fb27c3 (diff)
downloadportage-f84f2b119113b076964f632e5bf4d5414b4ec7ed.tar.gz
portage-f84f2b119113b076964f632e5bf4d5414b4ec7ed.tar.bz2
portage-f84f2b119113b076964f632e5bf4d5414b4ec7ed.zip
Short circuit the loop as soon as missing hashes are detected.
svn path=/main/trunk/; revision=7044
-rw-r--r--pym/portage/manifest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 5add55c81..61af21d94 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -487,12 +487,12 @@ class Manifest(object):
except OSError:
pass
if f in distfilehashes and \
+ not required_hash_types.difference(distfilehashes[f]) and \
((assumeDistHashesSometimes and mystat is None) or \
(assumeDistHashesAlways and mystat is None) or \
(assumeDistHashesAlways and mystat is not None and \
len(distfilehashes[f]) == len(self.hashes) and \
- distfilehashes[f]["size"] == mystat.st_size)) and \
- not required_hash_types.difference(distfilehashes[f]):
+ distfilehashes[f]["size"] == mystat.st_size)):
self.fhashdict["DIST"][f] = distfilehashes[f]
else:
try: