cudf: fix bad encoding of cudf package name

ocaml · Jul 2, 2024 · ac5510f · ac5510f
1 parent ea8874d
commit ac5510f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -26,6 +26,7 @@ users)
 ## Actions
 
 ## Install
+  * Fix package name display for no agreement conflicts [#6055 @rjbou - fix #6030]
 
 ## Remove
 

diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
@@ -426,7 +426,7 @@ module Package = struct
   type t = Cudf.package
   include Dose_common.CudfAdd
   let to_string = string_of_package
-  let name_to_string t = t.Cudf.package
+  let name_to_string t = OpamPackage.name_to_string (cudf2opam t)
   let version_to_string t = string_of_int t.Cudf.version
   let to_json = to_json
   let of_json = of_json

diff --git a/tests/reftests/empty-conflicts-007.test b/tests/reftests/empty-conflicts-007.test
@@ -16,7 +16,7 @@ opam-version: "2.0"
 ### opam switch create --empty encode-cudf
 ### opam install bar foo
 [ERROR] Package conflict!
-  * No agreement on the version of ba%5fz:
+  * No agreement on the version of ba_z:
     - bar -> ba_z < 2
     - foo -> ba_z >= 3