From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-108605-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1LACC0-0005cx-Or
	for garchives@archives.gentoo.org; Tue, 09 Dec 2008 23:40:40 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1A9CEE0394;
	Tue,  9 Dec 2008 23:40:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id EB10BE0394
	for <gentoo-commits@lists.gentoo.org>; Tue,  9 Dec 2008 23:40:38 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 7893965483
	for <gentoo-commits@lists.gentoo.org>; Tue,  9 Dec 2008 23:40:38 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1LACBy-0006Up-2Y
	for gentoo-commits@lists.gentoo.org; Tue, 09 Dec 2008 23:40:38 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r12188 - main/trunk/pym/portage
X-VCS-Repository: portage
X-VCS-Revision: 12188
X-VCS-Files: main/trunk/pym/portage/__init__.py
X-VCS-Directories: main/trunk/pym/portage
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1LACBy-0006Up-2Y@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Tue, 09 Dec 2008 23:40:38 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 0980cda6-24ac-47a1-b925-0e4ea70dab5c
X-Archives-Hash: df32fe3470d018f82631022bb6ffc345

Author: zmedico
Date: 2008-12-09 23:40:37 +0000 (Tue, 09 Dec 2008)
New Revision: 12188

Modified:
   main/trunk/pym/portage/__init__.py
Log:
In digestgen(), don't call fetch for files that already exist but have
invalid zero-size in the manifest.


Modified: main/trunk/pym/portage/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/trunk/pym/portage/__init__.py	2008-12-09 23:32:33 UTC (rev 12187=
)
+++ main/trunk/pym/portage/__init__.py	2008-12-09 23:40:37 UTC (rev 12188=
)
@@ -4259,9 +4259,6 @@
 				missing_files.append(myfile)
 				continue
 			size =3D myhashes.get("size")
-			if size =3D=3D 0:
-				missing_files.append(myfile)
-				continue
=20
 			try:
 				st =3D os.stat(os.path.join(mysettings["DISTDIR"], myfile))
@@ -4269,6 +4266,9 @@
 				if e.errno !=3D errno.ENOENT:
 					raise
 				del e
+				if size =3D=3D 0:
+					missing_files.append(myfile)
+					continue
 				if required_hash_types.difference(myhashes):
 					missing_files.append(myfile)
 					continue