OpamRepositoryPath.descr/url: remove

OpamAdminRepoUpgrade: deal locally with descr/url files OpamAdminCommand: adapt checks whether url is present, and whether the opam file version is good
ocaml · Oct 21, 2024 · 612ff8c · 612ff8c
1 parent d5d6ddd
commit 612ff8c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 28 deletions.
diff --git a/src/client/opamAdminCommand.ml b/src/client/opamAdminCommand.ml
@@ -332,6 +332,24 @@ let packages_with_prefixes repo_root packages =
             (List.rev missing_pkgs)));
   pkgs_map
 
+let check_opam_file_version_url has_error repo_root prefix nv opam =
+  let min_opam_version = OpamVersion.of_string "2.0" in
+  let url_file =
+    let ( // ) = OpamFilename.Op.( // ) in
+    OpamFile.(make
+                (OpamRepositoryPath.packages repo_root prefix nv // "url"))
+  in
+  if OpamFile.exists url_file then
+    (OpamConsole.warning "Not updating external URL file at %s"
+       (OpamFile.to_string url_file);
+     true)
+  else if OpamVersion.compare opam.OpamFile.OPAM.opam_version min_opam_version < 0 then
+    (OpamConsole.warning "OPAM version must be >= 2.0 at %s"
+       (OpamFile.to_string (OpamRepositoryPath.opam repo_root prefix nv));
+     true)
+  else
+    has_error
+
 let update_extrafiles_command_doc =
   "Add extra-files to an opam repository."
 let update_extrafiles_command cli =
@@ -368,12 +386,7 @@ let update_extrafiles_command cli =
           let opam_file = OpamRepositoryPath.opam repo_root prefix nv in
           let opam = OpamFile.OPAM.read opam_file in
           let has_error =
-            if OpamFile.exists (OpamRepositoryPath.url repo_root prefix nv) then
-              (OpamConsole.warning "Not updating external URL file at %s"
-                 (OpamFile.to_string
-                    (OpamRepositoryPath.url repo_root prefix nv));
-               true)
-            else has_error
+            check_opam_file_version_url has_error repo_root prefix nv opam
           in
           let files_dir = OpamRepositoryPath.files repo_root prefix nv in
           if OpamFilename.exists_dir files_dir then
@@ -552,11 +565,7 @@ let add_hashes_command cli =
           let opam_file = OpamRepositoryPath.opam repo_root prefix nv in
           let opam = OpamFile.OPAM.read opam_file in
           let has_error =
-            if OpamFile.exists (OpamRepositoryPath.url repo_root prefix nv) then
-              (OpamConsole.warning "Not updating external URL file at %s"
-                 (OpamFile.to_string (OpamRepositoryPath.url repo_root prefix nv));
-               true)
-            else has_error
+            check_opam_file_version_url has_error repo_root prefix nv opam
           in
           let process_url has_error urlf =
             let hashes = OpamFile.URL.checksum urlf in

diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
@@ -428,11 +428,12 @@ let do_upgrade repo_root =
         in
         if opam <> opam0 then
           (OpamFile.OPAM.write_with_preserved_format opam_file opam;
+           let ( // ) = OpamFilename.Op.( // ) in
            List.iter OpamFilename.remove [
-             OpamFile.filename
-               (OpamRepositoryPath.descr repo_root prefix package);
-             OpamFile.filename
-               (OpamRepositoryPath.url repo_root prefix package);
+             OpamFile.(filename (make
+                                   (OpamRepositoryPath.packages repo_root prefix package // "descr")));
+             OpamFile.(filename (make
+                                   (OpamRepositoryPath.packages repo_root prefix package // "url")));
            ];
            OpamConsole.status_line "Updated %s" (OpamFile.to_string opam_file))
     )

diff --git a/src/repository/opamRepositoryPath.ml b/src/repository/opamRepositoryPath.ml
@@ -44,12 +44,6 @@ let packages repo_root prefix nv =
 let opam repo_root prefix nv =
   packages repo_root prefix nv // "opam" |> OpamFile.make
 
-let descr repo_root prefix nv =
-  packages repo_root prefix nv // "descr" |> OpamFile.make
-
-let url repo_root prefix nv =
-  packages repo_root prefix nv // "url" |> OpamFile.make
-
 let files repo_root prefix nv =
   packages repo_root prefix nv / "files"
 

diff --git a/src/repository/opamRepositoryPath.mli b/src/repository/opamRepositoryPath.mli
@@ -41,13 +41,6 @@ val packages: dirname -> string option -> package -> dirname
     {i $repo/packages/XXX/$NAME.$VERSION/opam} *)
 val opam: dirname -> string option -> package -> OpamFile.OPAM.t OpamFile.t
 
-(** Return the description file for a given package:
-    {i $repo/packages/XXX/$NAME.VERSION/descr} *)
-val descr: dirname -> string option -> package -> OpamFile.Descr.t OpamFile.t
-
-(** urls {i $repo/package/XXX/$NAME.$VERSION/url} *)
-val url: dirname -> string option -> package -> OpamFile.URL.t OpamFile.t
-
 (** files {i $repo/packages/XXX/$NAME.$VERSION/files} *)
 val files: dirname -> string option -> package -> dirname