From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 6 Oct 2008 20:58:29 +0000 (-0000)
Subject: In fetch(), never call the pkg_nofetch phase when in "listonly" mode.
X-Git-Tag: v2.2_rc12~21
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2fc2cc120cdef58cc6aad995a188b0538326c03b;p=portage.git

In fetch(), never call the pkg_nofetch phase when in "listonly" mode.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 918040981..0e1f29b4a 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4057,7 +4057,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 
 		if listonly:
 			writemsg_stdout("\n", noiselevel=-1)
-		if fetched != 2:
+		elif fetched != 2:
 			if restrict_fetch:
 				print "\n!!!", mysettings["CATEGORY"] + "/" + \
 					mysettings["PF"], "has fetch restriction turned on."
@@ -4075,8 +4075,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 						mysettings.pop("EBUILD_PHASE", None)
 					else:
 						mysettings["EBUILD_PHASE"] = ebuild_phase
-			elif listonly:
-				continue
 			elif not filedict[myfile]:
 				writemsg("Warning: No mirrors available for file" + \
 					" '%s'\n" % (myfile), noiselevel=-1)