bug fix for stopping downloads
deferredlist returns a tuple of (success, result) and the previous code was looking at the entire tuple not the success values.
This commit is contained in:
parent
1151019186
commit
6035a84675
1 changed files with 2 additions and 3 deletions
|
@ -18,7 +18,6 @@ class DownloadManager(object):
|
||||||
self.progress_manager = None
|
self.progress_manager = None
|
||||||
self.blob_handler = None
|
self.blob_handler = None
|
||||||
self.connection_manager = None
|
self.connection_manager = None
|
||||||
|
|
||||||
self.blobs = {}
|
self.blobs = {}
|
||||||
self.blob_infos = {}
|
self.blob_infos = {}
|
||||||
|
|
||||||
|
@ -59,8 +58,8 @@ class DownloadManager(object):
|
||||||
d1.addBoth(check_stop, "progress manager")
|
d1.addBoth(check_stop, "progress manager")
|
||||||
d2 = self.connection_manager.stop()
|
d2 = self.connection_manager.stop()
|
||||||
d2.addBoth(check_stop, "connection manager")
|
d2.addBoth(check_stop, "connection manager")
|
||||||
dl = defer.DeferredList([d1, d2])
|
dl = defer.DeferredList([d1, d2], fireOnOneErrback=True, consumeErrors=True)
|
||||||
dl.addCallback(lambda xs: False not in xs)
|
dl.addCallback(lambda results: all([success for success, val in results]))
|
||||||
return dl
|
return dl
|
||||||
|
|
||||||
def add_blobs_to_download(self, blob_infos):
|
def add_blobs_to_download(self, blob_infos):
|
||||||
|
|
Loading…
Reference in a new issue