Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(MAINT) Ensure vendored path check works with mix of module builds #91

Merged
merged 1 commit into from
Feb 1, 2021
Merged

(MAINT) Ensure vendored path check works with mix of module builds #91

merged 1 commit into from
Feb 1, 2021

Conversation

michaeltlombardi
Copy link
Contributor

Prior to this commit the dsc_base_provider checked for the legacy vendored DSC module path before the new, specific path; in cases where the modules installed are a mix of old and new path, the old path will always exist, even if the specific module is not there (because it is looking for the container, as the container can hold any number of vendored modules).

This commit inverts the search order, seeking the most specific location first and falling back to the general location if needed.

Prior to this commit the dsc_base_provider checked for the legacy vendored
DSC module path before the new, specific path; in cases where the modules
installed are a mix of old and new path, the old path will _always_ exist,
even if the specific module is not there (because it is looking for the
*container*, as the container can hold any number of vendored modules).

This commit inverts the search order, seeking the most specific location
*first* and falling back to the general location if needed.
@michaeltlombardi michaeltlombardi requested a review from a team as a code owner January 29, 2021 23:44
Copy link
Contributor

@pmcmaw pmcmaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! :-) LGTM.

@pmcmaw pmcmaw merged commit 5eed112 into puppetlabs:main Feb 1, 2021
@michaeltlombardi michaeltlombardi deleted the maint/main/check-new-dsc-path-first branch February 1, 2021 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants