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 91804098138fbfcffbc248448d46f4a1a61d3f1d..0e1f29b4a82c218ab12be0e8e10ba7832ad2a221 100644 (file)
--- 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)