about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2017-10-12T11·10+0200
committerGitHub <noreply@github.com>2017-10-12T11·10+0200
commit97307811ee478c30472539a477981d24ec0971de (patch)
treeb4fd1ba4f5f6575bcf6472a85985152173830f97
parent73252aef18c73f4834b346c677fb723c3a58fb37 (diff)
parent6920c237016e5f33d06f948a6f8485e23c1900f6 (diff)
Merge pull request #1571 from teto/improve_priority_msg
Improve error message for conflicting priorities
-rw-r--r--src/buildenv/buildenv.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildenv/buildenv.cc b/src/buildenv/buildenv.cc
index 885c5e169039..f05aa7bf2fbb 100644
--- a/src/buildenv/buildenv.cc
+++ b/src/buildenv/buildenv.cc
@@ -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)