From 94dc7d201b6a3dff4856c28d58f62baea2d8ed87 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 3 Jun 2009 18:37:00 +0200 Subject: [PATCH] fix resume support again --- libraries/entropy/client/interfaces/fetch.py | 2 -- libraries/entropy/transceivers.py | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libraries/entropy/client/interfaces/fetch.py b/libraries/entropy/client/interfaces/fetch.py index b9671f365..279e8b78c 100644 --- a/libraries/entropy/client/interfaces/fetch.py +++ b/libraries/entropy/client/interfaces/fetch.py @@ -332,8 +332,6 @@ class FetchersMixin: data_transfer = fetchConn.get_transfer_rate() resumed = fetchConn.is_resumed() except KeyboardInterrupt: - if not existed_before: - do_stfu_rm(filepath) return -100, data_transfer, resumed except NameError: raise diff --git a/libraries/entropy/transceivers.py b/libraries/entropy/transceivers.py index bb6ecab44..2abdbec3e 100644 --- a/libraries/entropy/transceivers.py +++ b/libraries/entropy/transceivers.py @@ -185,7 +185,7 @@ class UrlFetcher: try: self.__remotefile = urllib2.urlopen(req) except KeyboardInterrupt: - self.__close(True) + self.__close(False) raise except urllib2.HTTPError, e: if (e.code == 405) and not u_agent_error: @@ -207,7 +207,7 @@ class UrlFetcher: "content-length")) self.__remotefile.close() except KeyboardInterrupt: - self.__close(True) + self.__close(False) raise except: pass @@ -228,7 +228,7 @@ class UrlFetcher: } ) except KeyboardInterrupt: - self.__close(True) + self.__close(False) raise except: pass @@ -240,7 +240,7 @@ class UrlFetcher: self.localfile = open(self.__path_to_save,"wb") self.__remotefile = urllib2.urlopen(request) except KeyboardInterrupt: - self.__close(True) + self.__close(False) raise except: self.__close(True) @@ -266,7 +266,7 @@ class UrlFetcher: if self.__thread_stop_func != None: self.__thread_stop_func() except KeyboardInterrupt: - self.__close(True) + self.__close(False) raise except self.socket.timeout: self.__close(True)