fixup

Author: kit-ty-kate

src/format/opamFile.ml

@@ -3674,7 +3674,10 @@ module OPAM = struct
        in
        (basename, content, hash)
      | Some (Some r, rel) ->
-       let files = get_repo_files r rel in
+       let files =
+         get_repo_files r
+           (rel ^ Filename.dir_sep ^ OpamRepositoryPathName.files_d)
+       in
        extra_files o >>| List.map @@ fun (basename, hash) ->
        let content =
          OpamStd.List.assoc_opt OpamFilename.Base.equal basename files
@@ -3696,7 +3699,7 @@ module OPAM = struct
            Printf.sprintf " in %s" dir
          | _, _, _, Some (Some repo, dir) ->
            Printf.sprintf " %s from repository %s"
-             (Filename.concat dir OpamPathName.opam_f)
+             (Filename.concat dir OpamRepositoryPathName.opam_f)
              (OpamRepositoryName.to_string repo)
          | _ -> "")
         (OpamStd.Format.itemize

src/state/opamRepositoryState.ml

@@ -91,9 +91,7 @@ let get_repo_root rt repo =
   get_root_raw rt.repos_global.root rt.repos_tmp repo.repo_name
 
 let get_repo_files rt name dir =
-  let dir =
-    OpamFilename.Op.(get_root rt name / dir / OpamRepositoryPathName.files_d)
-  in
+  let dir = OpamFilename.Op.(get_root rt name / dir) in
   let files = OpamFilename.rec_files dir in
   List.map (fun file ->
       OpamFilename.Base.of_string
@@ -113,12 +111,12 @@ let read_package_opam ~repo_name ~repo_root package_dir =
      with Failure _ ->
        log "ERR: directory name not a valid package: ignored %s"
          (OpamFilename.to_string
-            OpamFilename.Op.(package_dir // OpamPathName.opam_f));
+            OpamFilename.Op.(package_dir // OpamRepositoryPathName.opam_f));
        None)
   | None ->
     log "ERR: Could not load %s, ignored"
       (OpamFilename.to_string
-         OpamFilename.Op.(package_dir // OpamPathName.opam_f));
+         OpamFilename.Op.(package_dir // OpamRepositoryPathName.opam_f));
     None
 
 let load_opams_from_dir repo_name repo_root =