summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-27 08:22:40 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-27 08:22:40 +0000
commita99ad82ee91f749e5e9bf2ff9438a1ff23ee662d (patch)
treeb522156ecdcb8508d2399385f4e05f4f087c63b6
parenta572d4d348be6b27036a494b31a57e4f80a2f595 (diff)
downloadportage-a99ad82ee91f749e5e9bf2ff9438a1ff23ee662d.tar.gz
portage-a99ad82ee91f749e5e9bf2ff9438a1ff23ee662d.tar.bz2
portage-a99ad82ee91f749e5e9bf2ff9438a1ff23ee662d.zip
Simplify fetch failure logic.
svn path=/main/trunk/; revision=4030
-rw-r--r--pym/portage.py22
1 files changed, 10 insertions, 12 deletions
diff --git a/pym/portage.py b/pym/portage.py
index ad2c72c1c..43110b2e8 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2135,19 +2135,17 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
if listonly:
writemsg("\n")
- if fetched != 2 and restrict_fetch:
- print "\n!!!", mysettings["CATEGORY"] + "/" + \
- mysettings["PF"], "has fetch restriction turned on."
- print "!!! This probably means that this " + \
- "ebuild's files must be downloaded"
- print "!!! manually. See the comments in" + \
- " the ebuild for more information.\n"
- spawn(EBUILD_SH_BINARY + " nofetch", mysettings)
- if listonly:
- return 0
- if (fetched!=2) and not listonly:
+ if fetched != 2:
if restrict_fetch:
- pass
+ print "\n!!!", mysettings["CATEGORY"] + "/" + \
+ mysettings["PF"], "has fetch restriction turned on."
+ print "!!! This probably means that this " + \
+ "ebuild's files must be downloaded"
+ print "!!! manually. See the comments in" + \
+ " the ebuild for more information.\n"
+ spawn(EBUILD_SH_BINARY + " nofetch", mysettings)
+ elif listonly:
+ continue
elif not filedict[myfile]:
writemsg("Warning: No mirrors available for file" + \
" '%s'\n" % (myfile), noiselevel=-1)