Skip to content

Commit 729e4d6

Browse files
committed
Source compatibility with newer cmdliner versions
1 parent 7f0272e commit 729e4d6

5 files changed

Lines changed: 134 additions & 135 deletions

File tree

src/client/opamAdminCommand.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,12 +1409,12 @@ let help =
14091409
| None -> `Help (`Pager, None)
14101410
| Some topic ->
14111411
let topics = "topics" :: cmds in
1412-
let conv, _ = OpamCmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics) in
1412+
let conv = OpamCmdliner.Arg.conv_parser @@ OpamCmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics) in
14131413
match conv topic with
1414-
| `Error e -> `Error (false, e)
1415-
| `Ok t when t = "topics" ->
1414+
| Error (`Msg e) -> `Error (false, e)
1415+
| Ok t when t = "topics" ->
14161416
List.iter (OpamConsole.msg "%s\n") cmds; `Ok ()
1417-
| `Ok t -> `Help (man_format, Some t) in
1417+
| Ok t -> `Help (man_format, Some t) in
14181418

14191419
Term.(ret (const help $Arg.man_format $Term.choice_names $topic)),
14201420
Cmd.info "help" ~doc ~man

0 commit comments

Comments
 (0)