diff options
| -rw-r--r-- | src/libstore/builtins.cc | 6 | ||||
| -rw-r--r-- | src/libstore/download.cc | 4 | ||||
| -rw-r--r-- | src/libstore/download.hh | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/libstore/builtins.cc b/src/libstore/builtins.cc index 091a67428e4c..2a4396308399 100644 --- a/src/libstore/builtins.cc +++ b/src/libstore/builtins.cc @@ -7,14 +7,16 @@ void builtinFetchurl(const BasicDerivation & drv) { auto url = drv.env.find("url"); if (url == drv.env.end()) throw Error("attribute ‘url’ missing"); - printMsg(lvlInfo, format("downloading ‘%1%’...") % url->second); /* No need to do TLS verification, because we check the hash of the result anyway. */ DownloadOptions options; options.verifyTLS = false; - auto data = downloadFile(url->second, options); // FIXME: show progress + /* Show a progress indicator, even though stderr is not a tty. */ + options.forceProgress = true; + + auto data = downloadFile(url->second, options); auto out = drv.env.find("out"); if (out == drv.env.end()) throw Error("attribute ‘url’ missing"); diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 8ef3ab3f0b62..94c13249d494 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -114,8 +114,6 @@ struct Curl curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progressCallback_); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *) &curl); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); - - showProgress = isatty(STDERR_FILENO); } ~Curl() @@ -126,6 +124,8 @@ struct Curl bool fetch(const string & url, const DownloadOptions & options) { + showProgress = options.forceProgress || isatty(STDERR_FILENO); + curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); if (options.verifyTLS) diff --git a/src/libstore/download.hh b/src/libstore/download.hh index aff109ee7ce1..c1cb25b90c32 100644 --- a/src/libstore/download.hh +++ b/src/libstore/download.hh @@ -9,6 +9,7 @@ struct DownloadOptions { string expectedETag; bool verifyTLS{true}; + bool forceProgress{false}; }; struct DownloadResult |