aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/store-api.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore/store-api.cc')
-rw-r--r--src/libstore/store-api.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 27bfbcb8f..dd87a046e 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -30,14 +30,14 @@ bool Store::isStorePath(const Path & path) const
void Store::assertStorePath(const Path & path) const
{
if (!isStorePath(path))
- throw Error(format("path ‘%1%’ is not in the Nix store") % path);
+ throw Error(format("path '%1%' is not in the Nix store") % path);
}
Path Store::toStorePath(const Path & path) const
{
if (!isInStore(path))
- throw Error(format("path ‘%1%’ is not in the Nix store") % path);
+ throw Error(format("path '%1%' is not in the Nix store") % path);
Path::size_type slash = path.find('/', storeDir.size() + 1);
if (slash == Path::npos)
return path;
@@ -55,7 +55,7 @@ Path Store::followLinksToStore(const Path & _path) const
path = absPath(target, dirOf(path));
}
if (!isInStore(path))
- throw Error(format("path ‘%1%’ is not in the Nix store") % path);
+ throw Error(format("path '%1%' is not in the Nix store") % path);
return path;
}
@@ -88,14 +88,14 @@ void checkStoreName(const string & name)
/* Disallow names starting with a dot for possible security
reasons (e.g., "." and ".."). */
if (string(name, 0, 1) == ".")
- throw Error(format("illegal name: ‘%1%’") % name);
+ throw Error(format("illegal name: '%1%'") % name);
for (auto & i : name)
if (!((i >= 'A' && i <= 'Z') ||
(i >= 'a' && i <= 'z') ||
(i >= '0' && i <= '9') ||
validChars.find(i) != string::npos))
{
- throw Error(format("invalid character ‘%1%’ in name ‘%2%’")
+ throw Error(format("invalid character '%1%' in name '%2%'")
% i % name);
}
}
@@ -328,7 +328,7 @@ void Store::queryPathInfo(const Path & storePath,
if (res) {
stats.narInfoReadAverted++;
if (!*res)
- throw InvalidPath(format("path ‘%s’ is not valid") % storePath);
+ throw InvalidPath(format("path '%s' is not valid") % storePath);
return success(ref<ValidPathInfo>(*res));
}
}
@@ -343,7 +343,7 @@ void Store::queryPathInfo(const Path & storePath,
res.first == NarInfoDiskCache::oInvalid ? 0 : res.second);
if (res.first == NarInfoDiskCache::oInvalid ||
(res.second->path != storePath && storePathToName(storePath) != ""))
- throw InvalidPath(format("path ‘%s’ is not valid") % storePath);
+ throw InvalidPath(format("path '%s' is not valid") % storePath);
}
return success(ref<ValidPathInfo>(res.second));
}
@@ -368,7 +368,7 @@ void Store::queryPathInfo(const Path & storePath,
|| (info->path != storePath && storePathToName(storePath) != ""))
{
stats.narInfoMissing++;
- return failure(std::make_exception_ptr(InvalidPath(format("path ‘%s’ is not valid") % storePath)));
+ return failure(std::make_exception_ptr(InvalidPath(format("path '%s' is not valid") % storePath)));
}
callSuccess(success, failure, ref<ValidPathInfo>(info));
@@ -614,7 +614,7 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore, const PathSet & storePa
checkInterrupt();
if (!dstStore->isValidPath(storePath)) {
- printInfo("copying ‘%s’...", storePath);
+ printInfo("copying '%s'...", storePath);
copyStorePath(srcStore, dstStore, storePath, repair, checkSigs);
}
});
@@ -661,7 +661,7 @@ string showPaths(const PathSet & paths)
string s;
for (auto & i : paths) {
if (s.size() != 0) s += ", ";
- s += "‘" + i + "’";
+ s += "'" + i + "'";
}
return s;
}
@@ -670,7 +670,7 @@ string showPaths(const PathSet & paths)
std::string ValidPathInfo::fingerprint() const
{
if (narSize == 0 || !narHash)
- throw Error(format("cannot calculate fingerprint of path ‘%s’ because its size/hash is not known")
+ throw Error(format("cannot calculate fingerprint of path '%s' because its size/hash is not known")
% path);
return
"1;" + path + ";"
@@ -689,7 +689,7 @@ void ValidPathInfo::sign(const SecretKey & secretKey)
bool ValidPathInfo::isContentAddressed(const Store & store) const
{
auto warn = [&]() {
- printError(format("warning: path ‘%s’ claims to be content-addressed but isn't") % path);
+ printError(format("warning: path '%s' claims to be content-addressed but isn't") % path);
};
if (hasPrefix(ca, "text:")) {
@@ -782,7 +782,7 @@ ref<Store> openStore(const std::string & uri_,
}
}
- throw Error("don't know how to open Nix store ‘%s’", uri);
+ throw Error("don't know how to open Nix store '%s'", uri);
}