fix(pkg): tilde handling bug

Signed-off-by: Rudi Grinberg <[email protected]>
ocaml · Jan 18, 2025 · 54d7cee · 54d7cee
1 parent d019148
commit 54d7cee
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/vendor/opam/src/format/opamPackage.ml b/vendor/opam/src/format/opamPackage.ml
@@ -30,7 +30,7 @@ module Version = struct
   type version_small =
     { int : Int64.t
     ; style : version_style
-    ; has_suffix : bool
+    ; has_suffix : [`None | `Tilde | `Some ]
     }
 
   type version =
@@ -48,7 +48,12 @@ module Version = struct
       |> List.concat_map (String.split_on_char '~')
       |> List.concat_map (String.split_on_char '-')
     in
-    let has_suffix = List.length parts > 1 in
+    let has_suffix =
+      match parts with
+      | [] -> `None
+      | ["~"] -> `Tilde
+      | _ :: _ -> `Some
+    in
     match String.split_on_char '.' (List.nth parts 0) with
     | [] -> None
     | major :: rest ->
@@ -107,10 +112,11 @@ module Version = struct
       if c = 0 then
         (* Only consider the suffix if the numeric part of both versions is the same. *)
         match a.has_suffix, b.has_suffix with
-        | false, false -> Some 0
-        | false, true -> Some (-1)
-        | true, false -> Some 1
-        | true, true ->
+        | `Tilde, `Tilde
+        | `None, `None -> Some 0
+        | `Tilde, `None -> Some (-1)
+        | `None, `Tilde -> Some 1
+        | _ , _ ->
             (* If both versions have suffixes then run the full comparison. *)
             None
       else