summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-09 23:40:37 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-09 23:40:37 +0000
commitf66d305cbf2920b0d0e6c9247ac99b20e00b5f33 (patch)
tree4032186ccebcce7e5de443bcd70f7a2d66f77520
parent265d4c5f01c2674faf4639b28f81c2f690a9e8f1 (diff)
downloadportage-f66d305cbf2920b0d0e6c9247ac99b20e00b5f33.tar.gz
portage-f66d305cbf2920b0d0e6c9247ac99b20e00b5f33.tar.bz2
portage-f66d305cbf2920b0d0e6c9247ac99b20e00b5f33.zip
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
-rw-r--r--pym/portage/__init__.py6
1 files changed, 3 insertions, 3 deletions
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