diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-04 11:16:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-04-04 11:16:26 +0200 |
| commit | 258897c265a6d6575f1669a896ab6f5ab92337c3 (patch) | |
| tree | d904bafc05a246d50abe2cedf30515e1bccd6907 | |
| parent | 239841787bfbf499256c0bb9358f058a8243d60a (diff) | |
Complain if /homeless-shelter exists
| -rw-r--r-- | src/libstore/build.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 73223bc1a..137056810 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1697,7 +1697,8 @@ void DerivationGoal::startBuilder() if HOME is not set, but they will just assume that the settings file they are looking for does not exist if HOME is set but points to some non-existing path. */ - env["HOME"] = "/homeless-shelter"; + Path homeDir = "/homeless-shelter"; + env["HOME"] = homeDir; /* Tell the builder where the Nix store is. Usually they shouldn't care, but this is useful for purity checking (e.g., @@ -1946,6 +1947,9 @@ void DerivationGoal::startBuilder() else { + if (pathExists(homeDir)) + throw Error(format("directory `%1%' exists; please remove it") % homeDir); + /* We're not doing a chroot build, but we have some valid output paths. Since we can't just overwrite or delete them, we have to do hash rewriting: i.e. in the |