diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-01-29 12:22:58 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-01-29 12:22:58 +0000 |
commit | 07ffdc28629e537c3811f86b83a93655b73909ec (patch) | |
tree | 36b10bdd8ab47d4d0098248206a87ed64b3deb28 /src/libstore/build.cc | |
parent | ad529fb89fb34bea9762eccfc9c2ee6f1f2865c0 (diff) |
* Added an option "fsync-metadata" to fsync() changes to
/nix/var/nix/db.
* Removed the function writeStringToFile since it does (almost) the
same thing as writeFile.
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r-- | src/libstore/build.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index d56ae4570..77cffba25 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1318,18 +1318,18 @@ DerivationGoal::HookReply DerivationGoal::tryBuildHook() string s; foreach (PathSet::iterator, i, allInputs) s += *i + "\n"; - writeStringToFile(inputListFN, s); + writeFile(inputListFN, s); /* The `outputs' file lists all outputs that have to be copied from the remote system. */ s = ""; foreach (DerivationOutputs::iterator, i, drv.outputs) s += i->second.path + "\n"; - writeStringToFile(outputListFN, s); + writeFile(outputListFN, s); /* The `references' file has exactly the format accepted by `nix-store --register-validity'. */ - writeStringToFile(referencesFN, + writeFile(referencesFN, makeValidityRegistration(allInputs, true, false)); /* Tell the hook to proceed. */ @@ -1493,7 +1493,7 @@ void DerivationGoal::startBuilder() } /* Write closure info to `fileName'. */ - writeStringToFile(tmpDir + "/" + fileName, + writeFile(tmpDir + "/" + fileName, makeValidityRegistration(paths, false, false)); } @@ -1570,7 +1570,7 @@ void DerivationGoal::startBuilder() support Samba-in-QEMU. */ createDirs(chrootRootDir + "/etc"); - writeStringToFile(chrootRootDir + "/etc/passwd", + writeFile(chrootRootDir + "/etc/passwd", (format( "nixbld:x:%1%:65534:Nix build user:/:/noshell\n" "nobody:x:65534:65534:Nobody:/:/noshell\n") |