From c659166e86cebba4b6381abe454a09c92d74394b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 25 Sep 2006 22:57:23 +0000 Subject: [PATCH] Fix fetch resume logic for bug #145601 and document the meaning of the fetched variable. This patch is from trunk r4478. svn path=/main/branches/2.1.1/; revision=4538 --- pym/portage.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pym/portage.py b/pym/portage.py index 9e46cb4d3..8f774d9ee 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2035,6 +2035,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 @@ -2215,6 +2221,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: @@ -2223,6 +2231,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", raise except: pass + fetched = 1 continue if not fetchonly: fetched=2 -- 2.26.2