summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-10-06 20:58:29 +0000
committerZac Medico <zmedico@gentoo.org>2008-10-06 20:58:29 +0000
commit2fc2cc120cdef58cc6aad995a188b0538326c03b (patch)
tree9c300a695415bc35cc13badd88429d6e633372b7
parent70b194d9d7d131b20dc2707b026a23b4f80cf431 (diff)
downloadportage-2fc2cc120cdef58cc6aad995a188b0538326c03b.tar.gz
portage-2fc2cc120cdef58cc6aad995a188b0538326c03b.tar.bz2
portage-2fc2cc120cdef58cc6aad995a188b0538326c03b.zip
In fetch(), never call the pkg_nofetch phase when in "listonly" mode.
svn path=/main/trunk/; revision=11644
-rw-r--r--pym/portage/__init__.py4
1 files changed, 1 insertions, 3 deletions
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)