diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2023-02-08 20:03:57 +0100 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2023-02-27 21:39:34 +0100 |
| commit | 3113b13df9afaab918792c725742c6bc3fcec88b (patch) | |
| tree | a31a2fbd6157ca7005ca5472b632afcbe2ca5fe3 /src/libstore/builtins/buildenv.cc | |
| parent | 707ba52f2d1855f2613da3a576488f5040843915 (diff) | |
buildenv: throw BuildEnvFileConflictError with more context
At the moment an Error is thrown that only holds an error message
regarding `nix-env` and `nix profile`. These tools make use of
builtins.buildEnv, but buildEnv is also used in other places. These
places are unrelated to Nix profiles, so the error shouldn't mention
these tools.
This generic error is now BuildEnvFileConflictError, which holds more
contextual information about the files that were conflicting while
building the environment.
Diffstat (limited to 'src/libstore/builtins/buildenv.cc')
| -rw-r--r-- | src/libstore/builtins/buildenv.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc index b1fbda13d..7bba33fb9 100644 --- a/src/libstore/builtins/buildenv.cc +++ b/src/libstore/builtins/buildenv.cc @@ -92,13 +92,11 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir, if (S_ISLNK(dstSt.st_mode)) { auto prevPriority = state.priorities[dstFile]; if (prevPriority == priority) - throw Error( - "files '%1%' and '%2%' have the same priority %3%; " - "use 'nix-env --set-flag priority NUMBER INSTALLED_PKGNAME' " - "or type 'nix profile install --help' if using 'nix profile' to find out how " - "to change the priority of one of the conflicting packages" - " (0 being the highest priority)", - srcFile, readLink(dstFile), priority); + throw BuildEnvFileConflictError( + readLink(dstFile), + srcFile, + priority + ); if (prevPriority < priority) continue; if (unlink(dstFile.c_str()) == -1) |