aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/download.cc
diff options
context:
space:
mode:
authorGuillaume Maudoux <layus.on@gmail.com>2016-11-25 15:48:27 +0100
committerDomen Kožar <domen@dev.si>2016-11-25 15:48:27 +0100
commitf78126bfd6b6c8477fcdbc09b2f98772dbe9a1e7 (patch)
tree23a76a33f21ce39184bcbdcd28cb937d15968ce7 /src/libstore/download.cc
parent7ee43df8622cc0589d54248fb44cebe1c1d991d2 (diff)
Get rid of unicode quotes (#1140)
Diffstat (limited to 'src/libstore/download.cc')
-rw-r--r--src/libstore/download.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index 954044c23..8682d244f 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -87,7 +87,7 @@ struct CurlDownloader : public Downloader
if (requestHeaders) curl_slist_free_all(requestHeaders);
try {
if (!done)
- fail(DownloadError(Interrupted, format("download of ‘%s’ was interrupted") % request.uri));
+ fail(DownloadError(Interrupted, format("download of '%s' was interrupted") % request.uri));
} catch (...) {
ignoreException();
}
@@ -117,7 +117,7 @@ struct CurlDownloader : public Downloader
{
size_t realSize = size * nmemb;
std::string line((char *) contents, realSize);
- printMsg(lvlVomit, format("got header for ‘%s’: %s") % request.uri % trim(line));
+ printMsg(lvlVomit, format("got header for '%s': %s") % request.uri % trim(line));
if (line.compare(0, 5, "HTTP/") == 0) { // new response starts
result.etag = "";
auto ss = tokenizeString<vector<string>>(line, " ");
@@ -176,7 +176,7 @@ struct CurlDownloader : public Downloader
{
// FIXME: handle parallel downloads.
if (showProgress) {
- std::cerr << (format("downloading ‘%1%’... ") % request.uri);
+ std::cerr << (format("downloading '%1%'... ") % request.uri);
std::cerr.flush();
startTime = getTime();
}
@@ -234,7 +234,7 @@ struct CurlDownloader : public Downloader
if (effectiveUrlCStr)
result.effectiveUrl = effectiveUrlCStr;
- debug(format("finished download of ‘%s’; curl status = %d, HTTP status = %d, body = %d bytes")
+ debug(format("finished download of '%s'; curl status = %d, HTTP status = %d, body = %d bytes")
% request.uri % code % httpStatus % (result.data ? result.data->size() : 0));
if (code == CURLE_WRITE_ERROR && result.etag == request.expectedETag) {
@@ -261,10 +261,10 @@ struct CurlDownloader : public Downloader
auto exc =
code == CURLE_ABORTED_BY_CALLBACK && _isInterrupted
- ? DownloadError(Interrupted, format("download of ‘%s’ was interrupted") % request.uri)
+ ? DownloadError(Interrupted, format("download of '%s' was interrupted") % request.uri)
: httpStatus != 0
- ? DownloadError(err, format("unable to download ‘%s’: HTTP error %d") % request.uri % httpStatus)
- : DownloadError(err, format("unable to download ‘%s’: %s (%d)") % request.uri % curl_easy_strerror(code) % code);
+ ? DownloadError(err, format("unable to download '%s': HTTP error %d") % request.uri % httpStatus)
+ : DownloadError(err, format("unable to download '%s': %s (%d)") % request.uri % curl_easy_strerror(code) % code);
/* If this is a transient error, then maybe retry the
download after a while. */
@@ -534,7 +534,7 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa
if (effectiveUrl)
*effectiveUrl = url_;
} else if (!ss[1].empty()) {
- debug(format("verifying previous ETag ‘%1%’") % ss[1]);
+ debug(format("verifying previous ETag '%1%'") % ss[1]);
expectedETag = ss[1];
}
}
@@ -582,7 +582,7 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa
unpackedStorePath = "";
}
if (unpackedStorePath.empty()) {
- printInfo(format("unpacking ‘%1%’...") % url);
+ printInfo(format("unpacking '%1%'...") % url);
Path tmpDir = createTempDir();
AutoDelete autoDelete(tmpDir, true);
// FIXME: this requires GNU tar for decompression.
@@ -594,7 +594,7 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa
}
if (expectedStorePath != "" && storePath != expectedStorePath)
- throw nix::Error(format("hash mismatch in file downloaded from ‘%s’") % url);
+ throw nix::Error(format("hash mismatch in file downloaded from '%s'") % url);
return storePath;
}