Skip to content

Fix opam 1.3/2.0 json format parsing #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samoht merged 1 commit into from
Feb 23, 2018
Merged

Fix opam 1.3/2.0 json format parsing #220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/ci_opam.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ let json_of_src d =
in
value (dec d) (fun v _ -> v) d

let obj = function `O x -> x | _ -> assert false
let maybe_arr = function `A x -> x | _ -> []
let str = function `String x -> x | _ -> assert false
let obj = function `O x -> x | _ -> raise Not_found
let maybe_arr = function `A x -> x | `O x -> List.map snd x | _ -> []
let str = function `String x -> x | _ -> raise Not_found

let get_package_versions_from_json file =
let file = open_in file in
Expand All @@ -126,8 +126,8 @@ let get_package_versions_from_json file =
let version = str (List.assoc "version" o) in
if name = pkg_name then [] else [name ^ "." ^ version]
in
let get_install o = try get_pkg_ver (obj (List.assoc "install" o)) with Not_found -> [] in
let get_pkg elt = get_install (obj elt) in
let get_install o = get_pkg_ver (obj (List.assoc "install" o)) in
let get_pkg elt = try get_install (obj elt) with Not_found -> [] in
List.concat (List.map get_pkg (List.concat (List.map maybe_arr (maybe_arr (json_of_src decoder)))))
in
close_in file;
Expand Down