From a99ad82ee91f749e5e9bf2ff9438a1ff23ee662d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Jul 2006 08:22:40 +0000 Subject: Simplify fetch failure logic. svn path=/main/trunk/; revision=4030 --- pym/portage.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'pym') 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) -- cgit v1.2.3-1-g7c22