From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 26 Jun 2007 22:38:17 +0000 (-0000)
Subject: Short circuit the loop as soon as missing hashes are detected.
X-Git-Tag: v2.2_pre1~1141
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f84f2b119113b076964f632e5bf4d5414b4ec7ed;p=portage.git

Short circuit the loop as soon as missing hashes are detected.

svn path=/main/trunk/; revision=7044
---

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: