From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 26 Jun 2007 22:39:15 +0000 (-0000)
Subject: Short circuit the loop as soon as missing hashes are detected. (trunk r7044)
X-Git-Tag: v2.1.3~137
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b84bc718da0f97ce7691e548b6477864aab1927;p=portage.git

Short circuit the loop as soon as missing hashes are detected. (trunk r7044)

svn path=/main/branches/2.1.2/; revision=7045
---

diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py
index a8df77f43..cdccbd9fa 100644
--- a/pym/portage_manifest.py
+++ b/pym/portage_manifest.py
@@ -488,12 +488,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: