3 commit b8c8b94e9f642e52ca0cd1f8b125606b9ef13b78
4 Author: Daniel Bünzli <daniel.buenzli@erratique.ch>
5 Date: Wed Feb 8 15:07:13 2017 +0100
7 Avoid name clash with next version of cmdliner.
10 Index: opam-1.3.0/src/client/opamArg.ml
11 ===================================================================
12 --- opam-1.3.0.orig/src/client/opamArg.ml
13 +++ opam-1.3.0/src/client/opamArg.ml
14 @@ -436,9 +436,9 @@ let mk_flag ?section flags doc =
15 let doc = Arg.info ?docs:section ~doc flags in
16 Arg.(value & flag & doc)
18 -let mk_opt ?section ?vopt flags value doc conv default =
19 +let mk_opt ?section ?vopt flags value doc kind default =
20 let doc = Arg.info ?docs:section ~docv:value ~doc flags in
21 - Arg.(value & opt ?vopt conv default & doc)
22 + Arg.(value & opt ?vopt kind default & doc)
24 let mk_tristate_opt ?section flags value doc =
25 let doc = Arg.info ?docs:section ~docv:value ~doc flags in
26 @@ -510,13 +510,13 @@ let term_info title ~doc ~man =
27 let man = man @ help_sections in
28 Term.info ~sdocs:global_option_section ~docs:"COMMANDS" ~doc ~man title
30 -let arg_list name doc conv =
31 +let arg_list name doc kind =
32 let doc = Arg.info ~docv:name ~doc [] in
33 - Arg.(value & pos_all conv [] & doc)
34 + Arg.(value & pos_all kind [] & doc)
36 -let nonempty_arg_list name doc conv =
37 +let nonempty_arg_list name doc kind =
38 let doc = Arg.info ~docv:name ~doc [] in
39 - Arg.(non_empty & pos_all conv [] & doc)
40 + Arg.(non_empty & pos_all kind [] & doc)
43 let print_short_flag =