Skip to content

Commit

Permalink
Always get "oasis" package versions from OPAM
Browse files Browse the repository at this point in the history
This is important for the comparison of packages, to merge the ones
that are equal.
  • Loading branch information
Chris00 committed Feb 25, 2014
1 parent f25724b commit 8de647a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/BuildDepends.ml
Expand Up @@ -351,7 +351,7 @@ let output t fmt flags =
let pkgs = List.map (fun (l,v,_) -> (Opam.of_findlib_warn l, v)) deps in let pkgs = List.map (fun (l,v,_) -> (Opam.of_findlib_warn l, v)) deps in
let pkgs = (["ocamlfind", Version.Set.empty], pkg.findlib_version) :: pkgs in let pkgs = (["ocamlfind", Version.Set.empty], pkg.findlib_version) :: pkgs in
let pkgs = if Tarball.needs_oasis t then let pkgs = if Tarball.needs_oasis t then
(["oasis", Version.Set.empty], None) :: pkgs (Opam.of_findlib "oasis", None) :: pkgs
else pkgs in else pkgs in
let pkgs = make_unique ~cmp:(fun (p1,_) (p2, _) -> Opam.compare_pkgs p1 p2) let pkgs = make_unique ~cmp:(fun (p1,_) (p2, _) -> Opam.compare_pkgs p1 p2)
~merge:merge_pkgs ~merge:merge_pkgs
Expand Down

0 comments on commit 8de647a

Please sign in to comment.