lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #1571 from teto/improve_priority_msg

Browse source 
Improve error message for conflicting priorities
This commit is contained in:
Eelco Dolstra 2017-10-12 13:10:44 +02:00 committed by GitHub
parent 73252aef18 6920c23701
commit 97307811ee
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/buildenv/buildenv.cc
View file

@ -74,10 +74,11 @@ static void createLinks(const Path & srcDir, const Path & dstDir, int priority)
auto prevPriority = priorities[dstFile]; auto prevPriority = priorities[dstFile];
if (prevPriority == priority) if (prevPriority == priority)
throw Error(format( throw Error(format(
"collision between '%1%' and '%2%'; " "Packages '%1%' and '%2%' have the same priority '%3%'"
"use 'nix-env --set-flag priority NUMBER PKGNAME' " "use 'nix-env --set-flag priority NUMBER INSTALLED_PKGNAME' "
"to change the priority of one of the conflicting packages" "to change the priority of one of the conflicting packages"
) % srcFile % target); " ('0' being the highest priority)"
) % srcFile % target % priority);
if (prevPriority < priority) if (prevPriority < priority)
continue; continue;
if (unlink(dstFile.c_str()) == -1) if (unlink(dstFile.c_str()) == -1)