From 0ed876c0a94950876040c24a8802287015a52310 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 29 Apr 2013 08:58:01 +1000 Subject: [PATCH] Do not run any download type functions if performing a dry-run. --- source-builder/sb/download.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index 37344a1..0aadb80 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -313,10 +313,10 @@ def get_file(url, local, opts, config): urls.append(urlparse.urljoin(base, url_file)) urls.append(url) log.trace('_url: %s -> %s' % (','.join(urls), local)) - for url in urls: - for dl in downloaders: - if url.startswith(dl): - if downloaders[dl](url, local, config, opts): - return if not opts.dry_run(): + for url in urls: + for dl in downloaders: + if url.startswith(dl): + if downloaders[dl](url, local, config, opts): + return raise error.general('downloading %s: all paths have failed, giving up' % (url))