Merge pull request #24 from ocaml-opam/strict-exit

Be explicit that Ok values are not passed to `Term.exit`

bin/main.ml

@@ -65,7 +65,7 @@ let atom =
       let sversion = Re.Group.get sub 3 in
       let name = OpamPackage.Name.of_string sname in
       let sop = if sop = "." then "=" else sop in
-      let op = OpamLexer.relop sop in
+      let op = OpamLexer.FullPos.relop sop in
       let version = OpamPackage.Version.of_string sversion in
       `Ok (name, Some (op, version))
     with Not_found | Failure _ | OpamLexer.Error _ ->
@@ -100,4 +100,4 @@ let cmd =
 let () =
   match Term.eval cmd with
   | `Ok reason -> exit (OpamStd.Sys.get_exit_code reason)
-  | x -> Term.exit x
+  | `Error _ | `Help | `Version as x -> Term.exit x

dune-project

@@ -30,6 +30,7 @@ This package uses 0install's solver algorithm with opam packages.
   opam-state
   (ocaml (>= 4.08.0))
   0install-solver
+  (opam-file-format (>= 2.1.1))
   (opam-client :with-test)
   (opam-solver :with-test)
   (astring :with-test)

opam-0install.opam

@@ -25,6 +25,7 @@ depends: [
   "opam-state"
   "ocaml" {>= "4.08.0"}
   "0install-solver"
+  "opam-file-format" {>= "2.1.1"}
   "opam-client" {with-test}
   "opam-solver" {with-test}
   "astring" {with-test}