Also check if CONTROL is a file #574
Closed
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
|
There might be other places where we check this improperly. Maybe we need an e2e test for this? |
BillyONeal
requested changes
Jun 7, 2022
Co-authored-by: Billy O'Neal <bion@microsoft.com>
BillyONeal
added a commit
to BillyONeal/vcpkg-tool
that referenced
this pull request
Jun 10, 2022
… a consumer manifest. Today, manifest mode works by effectively injecting the manifest directory as an overlay and letting load_port handle the situation. However, this means that the consuming manifest needs to follow all normal port rules, such as not having a CONTROL file. microsoft#574 attempts to partially fix this by not failing of the CONTROL found is a directory rather than a file, but we really shouldn't be having opinions about the consuming location at all. Changes: * Delete namespace PortFileProvider. * Fix OverlayProviderImpl::load_port to be consistent with OverlayProviderImpl::load_all_control_files (reversing the order) * Add ManifestProvider and CombinedProvider which explicitly model the loaded manifest overlay without needing to treat the manifest directory as a port directory * Fix plumbing in install.cpp to use the same overlay provider at all times.
BillyONeal
added a commit
to BillyONeal/vcpkg-tool
that referenced
this pull request
Jun 10, 2022
… a consumer manifest. Today, manifest mode works by effectively injecting the manifest directory as an overlay and letting load_port handle the situation. However, this means that the consuming manifest needs to follow all normal port rules, such as not having a CONTROL file. microsoft#574 attempts to partially fix this by not failing of the CONTROL found is a directory rather than a file, but we really shouldn't be having opinions about the consuming location at all. Changes: * Delete namespace PortFileProvider. * Fix OverlayProviderImpl::load_port to be consistent with OverlayProviderImpl::load_all_control_files (reversing the order) * Add ManifestProvider and CombinedProvider which explicitly model the loaded manifest overlay without needing to treat the manifest directory as a port directory * Fix plumbing in install.cpp to use the same overlay provider at all times.
BillyONeal
added a commit
to BillyONeal/vcpkg-tool
that referenced
this pull request
Jun 10, 2022
… a consumer manifest. Today, manifest mode works by effectively injecting the manifest directory as an overlay and letting load_port handle the situation. However, this means that the consuming manifest needs to follow all normal port rules, such as not having a CONTROL file. microsoft#574 attempts to partially fix this by not failing of the CONTROL found is a directory rather than a file, but we really shouldn't be having opinions about the consuming location at all. Changes: * Add ManifestProvider and CombinedProvider which explicitly model the loaded manifest overlay without needing to treat the manifest directory as a port directory * Fix plumbing in install.cpp to use the same overlay provider at all times. Competing resolution of microsoft#574 / microsoft/vcpkg#22686
|
I believe #582 is the correct fix. |
BillyONeal
added a commit
that referenced
this pull request
Jun 14, 2022
… a consumer manifest. (#582) * Don't complain about CONTROL files or directories in the directory of a consumer manifest. Today, manifest mode works by effectively injecting the manifest directory as an overlay and letting load_port handle the situation. However, this means that the consuming manifest needs to follow all normal port rules, such as not having a CONTROL file. #574 attempts to partially fix this by not failing of the CONTROL found is a directory rather than a file, but we really shouldn't be having opinions about the consuming location at all. Changes: * Add ManifestProvider and CombinedProvider which explicitly model the loaded manifest overlay without needing to treat the manifest directory as a port directory * Fix plumbing in install.cpp to use the same overlay provider at all times. Competing resolution of #574 / microsoft/vcpkg#22686 * Add e2e test and make the manifest file the primary overlay. * Add missing overrides. * Degeneralize IOverlayProvider
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.
Fixes microsoft/vcpkg#22686
We also may want to have
Filesystem::file_exists()/Filesystem::directory_exists().