From 8d76bed60f9c2f5e83079f3fd7c050efe56b5acf Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 7 Jun 2008 19:30:28 +0100 Subject: [PATCH] Don't try a mirror if the download failed because the user aborted it --- zeroinstall/injector/fetch.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zeroinstall/injector/fetch.py b/zeroinstall/injector/fetch.py index 0c20336..e3e0e0d 100644 --- a/zeroinstall/injector/fetch.py +++ b/zeroinstall/injector/fetch.py @@ -96,6 +96,7 @@ class Fetcher(object): @param iface_cache: cache in which to store the feed @type iface_cache: L{iface_cache.IfaceCache} @param force: whether to abort and restart an existing download""" + from download import DownloadAborted debug("download_and_import_feed %s (force = %d)", feed_url, force) assert not feed_url.startswith('/') @@ -121,6 +122,8 @@ class Fetcher(object): raise # Don't bother trying the mirror if we have a trust problem except ReplayAttack, ex: raise # Don't bother trying the mirror if we have a replay attack + except DownloadAborted, ex: + raise # Don't bother trying the mirror if the user cancelled except SafeException, ex: # Primary failed primary = None -- 2.11.4.GIT