From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 9 Dec 2008 23:40:37 +0000 (-0000)
Subject: In digestgen(), don't call fetch for files that already exist but have
X-Git-Tag: v2.2_rc18~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f66d305cbf2920b0d0e6c9247ac99b20e00b5f33;p=portage.git

In digestgen(), don't call fetch for files that already exist but have
invalid zero-size in the manifest.

svn path=/main/trunk/; revision=12188
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 860eea38b..5e6fc9125 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4259,9 +4259,6 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
 				missing_files.append(myfile)
 				continue
 			size = myhashes.get("size")
-			if size == 0:
-				missing_files.append(myfile)
-				continue
 
 			try:
 				st = os.stat(os.path.join(mysettings["DISTDIR"], myfile))
@@ -4269,6 +4266,9 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
 				if e.errno != errno.ENOENT:
 					raise
 				del e
+				if size == 0:
+					missing_files.append(myfile)
+					continue
 				if required_hash_types.difference(myhashes):
 					missing_files.append(myfile)
 					continue