From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 2 Oct 2011 23:43:27 +0000 (-0700)
Subject: Manifest.create(): tweak assume-digests code
X-Git-Tag: v2.2.0_alpha61~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5b963b794be20276786447bc4f2515e17e38086;p=portage.git

Manifest.create(): tweak assume-digests code

If we have a local file, before we assume that we don't need to compute
any digests, make sure that the pre-computed digest types are exactly
the same types that we desire.
---

diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 9db8acc1e..d09de2606 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -387,7 +387,7 @@ class Manifest(object):
 				((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 \
+				set(distfilehashes[f]) == set(self.hashes) and \
 				distfilehashes[f]["size"] == mystat.st_size)):
 				self.fhashdict["DIST"][f] = distfilehashes[f]
 			else: