From 8b84bc718da0f97ce7691e548b6477864aab1927 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 26 Jun 2007 22:39:15 +0000 Subject: [PATCH] Short circuit the loop as soon as missing hashes are detected. (trunk r7044) svn path=/main/branches/2.1.2/; revision=7045 --- pym/portage_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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: -- 2.26.2