From 3c68f6fa00a260b54dc23b0637a1327870143a77 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Thu, 14 Sep 2017 15:31:32 +0200 Subject: [PATCH] fix(leanpkg): fix error message --- leanpkg/leanpkg/resolve.lean | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/leanpkg/leanpkg/resolve.lean b/leanpkg/leanpkg/resolve.lean index aa353ebd35..60a1bc0d1f 100644 --- a/leanpkg/leanpkg/resolve.lean +++ b/leanpkg/leanpkg/resolve.lean @@ -87,11 +87,11 @@ deps ← monad.filter (not_yet_assigned ∘ dependency.name) d.dependencies, deps.mmap' (materialize relpath), deps.mmap' $ λ dep, do p ← resolved_path dep.name, - d ← manifest.from_file $ p ++ "/" ++ "leanpkg.toml", - when (d.name ≠ dep.name) $ - io.fail $ d.name ++ " (in " ++ relpath ++ ") depends on " ++ d.name ++ + d' ← manifest.from_file $ p ++ "/" ++ "leanpkg.toml", + when (d'.name ≠ dep.name) $ + io.fail $ d.name ++ " (in " ++ relpath ++ ") depends on " ++ d'.name ++ ", but resolved dependency has name " ++ dep.name ++ " (in " ++ p ++ ")", - solve_deps_core p d max_depth + solve_deps_core p d' max_depth def solve_deps (d : manifest) : io assignment := do (_, assg) ← solve_deps_core "." d 1024 $ assignment.empty.insert d.name ".",