Merge pull request #1571 from teto/improve_priority_msg
Improve error message for conflicting priorities
This commit is contained in:
commit
97307811ee
1 changed files with 4 additions and 3 deletions
|
@ -74,10 +74,11 @@ static void createLinks(const Path & srcDir, const Path & dstDir, int priority)
|
|||
auto prevPriority = priorities[dstFile];
|
||||
if (prevPriority == priority)
|
||||
throw Error(format(
|
||||
"collision between '%1%' and '%2%'; "
|
||||
"use 'nix-env --set-flag priority NUMBER PKGNAME' "
|
||||
"Packages '%1%' and '%2%' have the same priority '%3%'"
|
||||
"use 'nix-env --set-flag priority NUMBER INSTALLED_PKGNAME' "
|
||||
"to change the priority of one of the conflicting packages"
|
||||
) % srcFile % target);
|
||||
" ('0' being the highest priority)"
|
||||
) % srcFile % target % priority);
|
||||
if (prevPriority < priority)
|
||||
continue;
|
||||
if (unlink(dstFile.c_str()) == -1)
|
||||
|
|
Loading…
Reference in a new issue