lint: fix extra-files handling

bug introduced in ocaml#5068
rjbou · Mar 28, 2023 · 267b052 · 267b052
1 parent 7f4558d
commit 267b052
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -156,6 +156,7 @@ users)
   * W62: use the spdx_licenses library to check for valid licenses. This allows to use compound expressions such as "MIT AND (GPL-2.0-only OR LGPL-2.0-only)", as well as user defined licenses e.g. "LicenseRef-my-custom-license" [#4768 @kit-ty-kate - fixes #4598]
   * E57 (capital on synopsis) not trigger W47 (empty descr) [#5070 @rjbou]
   * [BUG] Fix linting packages from repository with tarred repositories, the file in temporary repository was no more avaiable when lint is done [#5068 @rjbou]
+    * Fix extra-files handling [#XXX @rjbou]
   * Update repository package filename display [#5068 @rjbou]
   * E67: check checksums only for vcs urls [#4960 @rjbou]
   * E57: Enforce synopsis to always be there, restoring behaviour from opam 2.1 [#5442 @kit-ty-kate]

diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml
@@ -3790,8 +3790,8 @@ let lint cli =
            let opam = OpamSwitchState.opam st nv in
            match OpamPinned.orig_opam_file st (OpamPackage.name nv) opam with
            | None -> raise Not_found
-           | Some f ->
-             let filename =
+           | Some file ->
+             let label =
                match OpamFile.OPAM.metadata_dir opam with
                | None -> None
                | Some (None, abs) ->
@@ -3808,7 +3808,7 @@ let lint cli =
                          (OpamRepositoryName.to_string repo)
                          (OpamPackage.to_string nv))
              in
-             [`pkg (OpamFilename.read (OpamFile.filename f), filename)]
+             [`pkg (file, label)]
          with Not_found ->
            OpamConsole.error_and_exit `Not_found "No opam file found for %s%s"
              (OpamPackage.Name.to_string (fst pkg))
@@ -3834,12 +3834,10 @@ let lint cli =
               | `file f ->
                 OpamFileTools.lint_file ~check_upstream ~handle_dirname:true f,
                 Some (OpamFile.to_string f)
-              | `pkg (content, filename) ->
-                OpamFileTools.lint_string
-                  ~check_upstream ~handle_dirname:false
-                  OpamStd.Option.(default stdin_f (map to_file filename))
-                  content,
-                filename
+              | `pkg (file, label) ->
+                OpamFileTools.lint_file ~check_upstream ~handle_dirname:false
+                  file,
+                label
               | `stdin ->
                 OpamFileTools.lint_channel ~check_upstream ~handle_dirname:false
                   stdin_f stdin,