aboutsummaryrefslogtreecommitdiff
path: root/src/buildenv
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2016-11-26 00:37:43 +0100
committerEelco Dolstra <edolstra@gmail.com>2016-11-26 00:38:01 +0100
commit215b70f51e5abd350c9b7db656aedac9d96d0046 (patch)
tree95778448ecdfbc1d8f4c254813cc5d91ed62a832 /src/buildenv
parentf78126bfd6b6c8477fcdbc09b2f98772dbe9a1e7 (diff)
Revert "Get rid of unicode quotes (#1140)"
This reverts commit f78126bfd6b6c8477fcdbc09b2f98772dbe9a1e7. There really is no need for such a massive change...
Diffstat (limited to 'src/buildenv')
-rw-r--r--src/buildenv/buildenv.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/buildenv/buildenv.cc b/src/buildenv/buildenv.cc
index 885c5e169..f997096ed 100644
--- a/src/buildenv/buildenv.cc
+++ b/src/buildenv/buildenv.cc
@@ -12,7 +12,7 @@ static bool isDirectory (const Path & path)
{
struct stat st;
if (stat(path.c_str(), &st) == -1)
- throw SysError(format("getting status of '%1%'") % path);
+ throw SysError(format("getting status of ‘%1%’") % path);
return S_ISDIR(st.st_mode);
}
@@ -53,18 +53,18 @@ static void createLinks(const Path & srcDir, const Path & dstDir, int priority)
} else if (S_ISLNK(dstSt.st_mode)) {
auto target = readLink(dstFile);
if (!isDirectory(target))
- throw Error(format("collision between '%1%' and non-directory '%2%'")
+ throw Error(format("collision between ‘%1%’ and non-directory ‘%2%’")
% srcFile % target);
if (unlink(dstFile.c_str()) == -1)
- throw SysError(format("unlinking '%1%'") % dstFile);
+ throw SysError(format("unlinking ‘%1%’") % dstFile);
if (mkdir(dstFile.c_str(), 0755) == -1)
- throw SysError(format("creating directory '%1%'"));
+ throw SysError(format("creating directory ‘%1%’"));
createLinks(target, dstFile, priorities[dstFile]);
createLinks(srcFile, dstFile, priority);
continue;
}
} else if (errno != ENOENT)
- throw SysError(format("getting status of '%1%'") % dstFile);
+ throw SysError(format("getting status of ‘%1%’") % dstFile);
} else {
struct stat dstSt;
auto res = lstat(dstFile.c_str(), &dstSt);
@@ -74,17 +74,17 @@ static void createLinks(const Path & srcDir, const Path & dstDir, int priority)
auto prevPriority = priorities[dstFile];
if (prevPriority == priority)
throw Error(format(
- "collision between '%1%' and '%2%'; "
- "use 'nix-env --set-flag priority NUMBER PKGNAME' "
+ "collision between ‘%1%’ and ‘%2%’; "
+ "use ‘nix-env --set-flag priority NUMBER PKGNAME’ "
"to change the priority of one of the conflicting packages"
) % srcFile % target);
if (prevPriority < priority)
continue;
if (unlink(dstFile.c_str()) == -1)
- throw SysError(format("unlinking '%1%'") % dstFile);
+ throw SysError(format("unlinking ‘%1%’") % dstFile);
}
} else if (errno != ENOENT)
- throw SysError(format("getting status of '%1%'") % dstFile);
+ throw SysError(format("getting status of ‘%1%’") % dstFile);
}
createSymlink(srcFile, dstFile);
priorities[dstFile] = priority;
@@ -112,7 +112,7 @@ static void addPkg(const Path & pkgDir, int priority)
if (!fd) {
if (errno == ENOENT)
return;
- throw SysError(format("opening '%1%'") % propagatedFN);
+ throw SysError(format("opening ‘%1%’") % propagatedFN);
}
propagated = readLine(fd.get());
}