Merge pull request #222 from ocaml-opam/revert-218-cmdliner

Revert "update to cmdliner >=1.1.0"
ocaml-opam · Nov 20, 2022 · 0797940 · 0797940
2 parents aceb3f4 + b0f2644
commit 0797940
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/bin/opam2web.ml b/bin/opam2web.ml
@@ -250,15 +250,16 @@ let default_cmd =
            ~docv:"REPOSITORY"
            ~doc:"Directories containing the repositories to consider")
   in
-  Term.(const build $ log_files $ out_dir $ content_dir
+  Term.(pure build $ log_files $ out_dir $ content_dir
           $ repositories_arg $ root_uri $ blog_source_uri),
-  Cmd.info "opam2web" ~version ~doc ~man
+  Term.info "opam2web" ~version ~doc ~man
 
 let () =
   OpamFormatConfig.init ();
   OpamStd.Config.init ();
   OpamRepositoryConfig.init ();
   OpamSolverConfig.init ();
   OpamStateConfig.init ();
-  let t, info = default_cmd in
-  exit (Cmd.eval (Cmd.v info t))
+  match Term.eval default_cmd with
+  | `Error _ -> exit 1
+  | _ -> exit 0
diff --git a/opam2web.opam b/opam2web.opam
@@ -21,7 +21,7 @@ depends: [
   "cohttp-lwt-unix"
   "yojson" {>= "1.6.0"}
   "opam-file-format" {< "2.1.1"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.0.4"}
   "omd" {>= "1.3.1" & < "2.0.0~"}
 ]
 build: [