wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 04:21:16 +02:00
Code Activity

* Allow `make check' to work in directories that have symlink

Browse source 
components.
This commit is contained in:
Eelco Dolstra 2006-03-10 22:27:26 +00:00
parent 37d1b1cafd
commit fdea084c36
3 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libmain/shared.cc
View file

@ -23,7 +23,7 @@ extern "C" {
volatile sig_atomic_t blockInt = 0;
void sigintHandler(int signo)
static void sigintHandler(int signo)
{
if (!blockInt) {
_isInterrupted = 1;
@ -54,7 +54,7 @@ void printGCWarning()
}
void setLogType(string lt)
static void setLogType(string lt)
{
if (lt == "pretty") logType = ltPretty;
else if (lt == "escapes") logType = ltEscapes;
@ -63,22 +63,6 @@ void setLogType(string lt)
}
void checkStoreNotSymlink(Path path)
{
struct stat st;
while (path != "/") {
if (lstat(path.c_str(), &st))
throw SysError(format("getting status of `%1%'") % path);
if (S_ISLNK(st.st_mode))
throw Error(format(
"the path `%1%' is a symlink; "
"this is not allowed for the Nix store and its parent directories")
% path);
path = dirOf(path);
}
}
struct RemoveTempRoots
{
~RemoveTempRoots()
@ -109,11 +93,6 @@ static void initAndRun(int argc, char * * argv)
nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db");
nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR));
/* Check that the store directory and its parent are not
symlinks. */
if (getEnv("NIX_IGNORE_SYMLINK_STORE") != "1")
checkStoreNotSymlink(nixStore);
/* Catch SIGINT. */
struct sigaction act, oact;
act.sa_handler = sigintHandler;