This commit is contained in:
Jeremie Dimino 2017-02-27 11:58:06 +00:00
parent bd9033f9bb
commit eea483191f
1 changed files with 2 additions and 2 deletions

View File

@ -882,7 +882,7 @@ module Stanzas = struct
let parse sexps ~dir ~visible_packages = let parse sexps ~dir ~visible_packages =
let versions, sexps = let versions, sexps =
List.partition_map sexps ~f:(function List.partition_map sexps ~f:(function
| List (loc, [Atom (_, "jbuilder_version"); ver]) -> | List (loc, [Atom (_, "jbuild_version"); ver]) ->
Inl (Jbuild_version.t ver, loc) Inl (Jbuild_version.t ver, loc)
| sexp -> Inr sexp) | sexp -> Inr sexp)
in in
@ -891,7 +891,7 @@ module Stanzas = struct
| [] -> Jbuild_version.latest_stable | [] -> Jbuild_version.latest_stable
| [(v, _)] -> v | [(v, _)] -> v
| _ :: (_, loc) :: _ -> | _ :: (_, loc) :: _ ->
Loc.fail loc "jbuilder_version specified too many times" Loc.fail loc "jbuild_version specified too many times"
in in
List.filter_map sexps ~f:(Stanza.select version) List.filter_map sexps ~f:(Stanza.select version)
|> resolve_packages ~dir ~visible_packages |> resolve_packages ~dir ~visible_packages