search for: json_sourc

...i\": \"%s\"\n" source; - printf " }%s\n" (trailing_comma i (List.length sources)) - ) sources; - printf " ],\n"; - printf " \"templates\": [\n"; - iteri ( - fun i (name, { Index_parser.printable_name = printable_name; + let json_sources = + List.map ( + fun (source, key, proxy) -> + let item = [ "uri", JSON.String source ] in + let item = + match key with + | Sigchecker.No_Key -> item + | Sigchecker.Fingerprint fp -> + ("fingerprint", JSON.S...

...printf (f_"Source URI: %s\n") uri; + (match gpgkey with | Utils.No_Key -> () | Utils.Fingerprint fp -> printf (f_"Fingerprint: %s\n") fp; @@ -99,10 +99,10 @@ and list_entries_long ~sources index = and list_entries_json ~sources index = let json_sources = List.map ( - fun (source, key, proxy) -> - let item = [ "uri", JSON.String source ] in + fun { Sources.uri; gpgkey } -> + let item = [ "uri", JSON.String uri ] in let item = - match key with + match gpgkey with...

Move the simple OCaml JSON writer to mllib, so that can be enhanced and used also outside v2v. --- mllib/JSON.ml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mllib/JSON.mli | 26 ++++++++++++++++++++++++++ mllib/Makefile.am | 5 ++++- po/POTFILES-ml | 2 +- v2v/JSON.ml | 53 ----------------------------------------------------- v2v/JSON.mli | 26

No functional change, just code motion. --- builder/builder.ml | 6 +++--- builder/list_entries.ml | 12 ++++++------ builder/list_entries.mli | 2 +- builder/sigchecker.ml | 5 ----- builder/sigchecker.mli | 7 +------ builder/utils.ml | 5 +++++ 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index

...}) -> if not hidden then ( printf "%-24s %s\n" "os-version:" name; may (printf "%-24s %s\n" (s_"Full name:")) printable_name; @@ -107,7 +100,7 @@ and list_entries_long ~sources index = and list_entries_json ~sources index = let json_sources = List.map ( - fun { Sources.uri = uri; gpgkey = gpgkey } -> + fun { Sources.uri; gpgkey } -> let item = [ "uri", JSON.String uri ] in let item = match gpgkey with @@ -120,14 +113,8 @@ and list_entries_json ~sources index = ) source...

An evolution of: https://www.redhat.com/archives/libguestfs/2018-August/msg00155.html

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.