All portage.fetch() to succeed even if FETCHCOMMAND and RESUMECOMMAND aren't defined.

svn path=/main/trunk/; revision=5274

diff --git a/pym/portage.py b/pym/portage.py
index c5cdc8cc02ac74d44608aca057f138ad2f7c9ef9..2d9d11d3f022274854e2a53395a4f6269db303a2 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2042,12 +2042,6 @@ def spawn(mystring,mysettings,debug=0,free=0,droppriv=0,sesandbox=0,fd_pipes=Non
 def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",use_locks=1, try_mirrors=1):
        "fetch files.  Will use digest file if available."
 
-       for var_name in ("FETCHCOMMAND", "RESUMECOMMAND"):
-               if not mysettings.get(var_name, None):
-                       writemsg(("!!! %s is unset.  It should have been defined " + \
-                               "in /etc/make.globals.\n") % var_name,
-                               noiselevel=-1)
-                       return 0
        features = mysettings.features
        # 'nomirror' is bad/negative logic. You Restrict mirroring, not no-mirroring.
        if ("mirror" in mysettings["RESTRICT"].split()) or \
@@ -2172,6 +2166,10 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 
        can_fetch=True
 
+       for var_name in ("FETCHCOMMAND", "RESUMECOMMAND"):
+               if not mysettings.get(var_name, None):
+                       can_fetch = False
+
        if not listonly:
                dirmode  = 02070
                filemode =   060
@@ -2318,6 +2316,11 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                else:
                                                        writemsg("!!! File %s isn't fully fetched, but unable to complete it\n" % myfile,
                                                                noiselevel=-1)
+                                               for var_name in ("FETCHCOMMAND", "RESUMECOMMAND"):
+                                                       if not mysettings.get(var_name, None):
+                                                               writemsg(("!!! %s is unset.  It should " + \
+                                                               "have been defined in /etc/make.globals.\n") \
+                                                                % var_name, noiselevel=-1)
                                                return 0
                                        else:
                                                continue