pkg: copy files from opam repository to lock dir #8648
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Alizter
commented
Sep 14, 2023
| @@ -482,5 +482,40 @@ let solve_lock_dir solver_env version_preference (repo, repo_id) ~local_packages | |||
| | Ok pkgs_by_name -> | |||
| Lock_dir.create_latest_version pkgs_by_name ~ocaml:None ~repo_id | |||
| in | |||
| summary, lock_dir) | |||
| let files = | |||
There was a problem hiding this comment.
@rgrinberg Is there a better way to do this?
Alizter
commented
Sep 14, 2023
Alizter
commented
Sep 14, 2023
Alizter
commented
Sep 14, 2023
Alizter
commented
Sep 14, 2023
rgrinberg
reviewed
Sep 14, 2023
Alizter
force-pushed
the
ps/branch/pkg__copy_files_from_opam_repository_to_lock_dir
branch
from
2293d33 to
991dbe3
Compare
Alizter
commented
Sep 14, 2023
|
|
||
| The error message should have a location for the opam repository. | ||
|
|
||
| This does not currently seem to be the case. |
There was a problem hiding this comment.
This should be fixed once this todo is resolved:
Lines 368 to 369 in b982acf
Alizter
commented
Sep 14, 2023
| @@ -13,4 +13,6 @@ val solve_lock_dir | |||
| -> Version_preference.t | |||
| -> Opam_repo.t * (Loc.t * Repository_id.t) option | |||
| -> local_packages:OpamFile.OPAM.t OpamTypes.name_map | |||
| -> (Summary.t * Lock_dir.t, [ `Diagnostic_message of _ Pp.t ]) result | |||
| -> ( Summary.t * Lock_dir.t * Lock_dir.Write_disk.Files_entry.t Package_name.Map.Multi.t | |||
There was a problem hiding this comment.
Shall I make this a record?
Alizter
force-pushed
the
ps/branch/pkg__copy_files_from_opam_repository_to_lock_dir
branch
from
991dbe3 to
e9e7772
Compare
Signed-off-by: Ali Caglayan <[email protected]>
Signed-off-by: Ali Caglayan <[email protected]>
Alizter
force-pushed
the
ps/branch/pkg__copy_files_from_opam_repository_to_lock_dir
branch
from
e9e7772 to
eb3e3bb
Compare
Signed-off-by: Rudi Grinberg <[email protected]>
Alizter
deleted the
ps/branch/pkg__copy_files_from_opam_repository_to_lock_dir
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The opam solver now copies any files in the
filesdirectory inside a package directory in an opam repository.