maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Get rid of unicode quotes (#1140)"

Browse source 
This reverts commit f78126bfd6. There
really is no need for such a massive change...
This commit is contained in:
Eelco Dolstra 2016-11-26 00:37:43 +01:00
parent f78126bfd6
commit 215b70f51e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
96 changed files with 670 additions and 670 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libstore/download.cc
View file

@ -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;
}