Fix fetch resume logic for bug #145601 and document the meaning of the "fetched"...

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

diff --git a/pym/portage.py b/pym/portage.py
index 967b9aec4d4519adf59458bcf822917edc979136..d4f2358737d9f02b0b0c9208298f6b31b145723c 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2109,6 +2109,12 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                return 0
                        del distlocks_subdir
        for myfile in filedict.keys():
+               """
+               fetched  status
+               0        nonexistent
+               1        partially downloaded
+               2        completely downloaded
+               """
                myfile_path = os.path.join(mysettings["DISTDIR"], myfile)
                fetched=0
                file_lock = None
@@ -2289,6 +2295,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                                        try:
                                                                                                os.unlink(mysettings["DISTDIR"]+"/"+myfile)
                                                                                                writemsg(">>> Deleting invalid distfile. (Improper 404 redirect from server.)\n")
+                                                                                               fetched = 0
+                                                                                               continue
                                                                                        except SystemExit, e:
                                                                                                raise
                                                                                        except:
@@ -2297,6 +2305,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                                                                raise
                                                                        except:
                                                                                pass
+                                                               fetched = 1
                                                                continue
                                                        if not fetchonly:
                                                                fetched=2