Fix #2311, correct fallback file case #2312
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
Only include the "FALLBACK_FILE" if the normal search came up empty. Do not return a list containing the fallback/default along with the user-supplied files, only return the user-supplied files. This was an issue when using "ALLOW_LIST" in that it had both.
jphickey
force-pushed
the
fix-2311-filesearch
branch
from
eb6f2d3
to
75ecb39
Compare
|
Tested this fix with cert_testbed and confirmed that it now picks all the same header files that it used to. |
dzbaker
added
the
CCB:Ready
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Apr 28, 2023
*Combines:* cFE v7.0.0-rc4+dev287 **Includes:** *cFE* - nasa/cFE#2306 - nasa/cFE#2295 - nasa/cFE#2303 - nasa/cFE#2312 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Haven Carlson <havencarlson@users.noreply.github.com>
This was referenced Apr 28, 2023
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Apr 28, 2023
*Combines:* cFE v7.0.0-rc4+dev287 **Includes:** *cFE* - nasa/cFE#2306 - nasa/cFE#2295 - nasa/cFE#2303 - nasa/cFE#2312 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Haven Carlson <havencarlson@users.noreply.github.com>
dzbaker
added
CCB:Approved
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.
Checklist (Please check before submitting)
Describe the contribution
Only include the "FALLBACK_FILE" if the normal search came up empty. Do not return a list containing the fallback/default along with the user-supplied files, only return the user-supplied files. This was an issue when using "ALLOW_LIST" in that it had both.
Fixes #2311
Testing performed
Build with normal/default config, and build with overrides
Expected behavior changes
Overrides should work correctly again.
System(s) tested on
Debian
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.