diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-26 22:39:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-26 22:39:15 +0000 |
| commit | 8b84bc718da0f97ce7691e548b6477864aab1927 (patch) | |
| tree | b599e31e5f08f20601dd1bdaba13d1e4f786c5b2 /pym | |
| parent | 569ba3271a21c0f9ecf5bd7dec1ab1506cba014f (diff) | |
| download | portage-8b84bc718da0f97ce7691e548b6477864aab1927.tar.gz portage-8b84bc718da0f97ce7691e548b6477864aab1927.tar.bz2 portage-8b84bc718da0f97ce7691e548b6477864aab1927.zip | |
Short circuit the loop as soon as missing hashes are detected. (trunk r7044)
svn path=/main/branches/2.1.2/; revision=7045
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage_manifest.py | 4 |
1 files 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: |