From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RAVhD-0003Cq-Hz for garchives@archives.gentoo.org; Sun, 02 Oct 2011 23:43:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 962E421C183; Sun, 2 Oct 2011 23:43:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5E5C221C183 for ; Sun, 2 Oct 2011 23:43:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF9371B4006 for ; Sun, 2 Oct 2011 23:43:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1256680042 for ; Sun, 2 Oct 2011 23:43:38 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/manifest.py X-VCS-Directories: pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e5b963b794be20276786447bc4f2515e17e38086 Date: Sun, 2 Oct 2011 23:43:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 932d47436188abb0938c3947d99dbb2a commit: e5b963b794be20276786447bc4f2515e17e38086 Author: Zac Medico gentoo org> AuthorDate: Sun Oct 2 23:43:27 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 2 23:43:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De5b963b7 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. --- pym/portage/manifest.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py index 9db8acc..d09de26 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]) =3D=3D len(self.hashes) and \ + set(distfilehashes[f]) =3D=3D set(self.hashes) and \ distfilehashes[f]["size"] =3D=3D mystat.st_size)): self.fhashdict["DIST"][f] =3D distfilehashes[f] else: