From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 28 Dec 2010 21:58:16 +0000 (-0800)
Subject: fetch: fix listonly/allow_missing_digests logic
X-Git-Tag: v2.2.0_alpha11~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d42d71c7e4609ea2332a8189ef1c63357f1b771;p=portage.git

fetch: fix listonly/allow_missing_digests logic
---

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 3e6326a49..7d61e900b 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -532,7 +532,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 
 		orig_digests = mydigests.get(myfile, {})
 
-		if not allow_missing_digests:
+		if not (allow_missing_digests or listonly):
 			verifiable_hash_types = set(orig_digests).intersection(hashfunc_map)
 			verifiable_hash_types.discard("size")
 			if not verifiable_hash_types:
@@ -551,9 +551,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 				writemsg(_("!!! Got:      %s\n!!! Expected: %s\n") % \
 					(reason[1], reason[2]), noiselevel=-1)
 
-				if listonly:
-					continue
-				elif fetchonly:
+				if fetchonly:
 					failed_files.add(myfile)
 					continue
 				else: