Fix #790, allow directories and symlinks in FILELIST.#1158
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom Feb 24, 2021
Merged
Fix #790, allow directories and symlinks in FILELIST.#1158astrogeco merged 1 commit intonasa:integration-candidatefrom
astrogeco merged 1 commit intonasa:integration-candidatefrom
Conversation
Checks a name-based subdirectory under ${MISSION_DEFS} for
files listed in the FILELIST for that target.
If file is a symlink, the link should be followed so the correct
content is installed, not a symlink.
Contributor
|
CCB 2021-02-17 APPROVED
|
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Feb 26, 2021
Bumps to: - cFE v6.8.0-rc1+dev365 - osal v5.2.0-rc1+dev280 - cFS-GroundSystem v2.2.0-rc1+dev29 See: - nasa/osal#830 - nasa/cFE#1171 - nasa/cFS-GroundSystem#162 Includes: - nasa/cFE#1148 - nasa/cFE#1168 - nasa/cFE#1158 - nasa/cFE#1151 - nasa/cFE#1173 - nasa/osal#794 - nasa/osal#818 - nasa/osal#820 - nasa/osal#815 - nasa/osal#813 - nasa/osal#822 - nasa/osal#823 - nasa/cFS-GroundSystem#156
This file contains hidden or 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
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.
Describe the contribution
Checks a name-based subdirectory under ${MISSION_DEFS} for files listed in the FILELIST for that target. If file is a symlink, the link should be followed so the correct content is installed, not a symlink.
Fixes #790
Testing performed
Created a symlink in a target name subdirectory (see additional context) and confirm that the correct file content is installed.
Expected behavior changes
Items in FILELIST can be in a target name directory, and may be symlinks.
System(s) tested on
Ubuntu 20.04
Additional context
This also adds another "NOTE" message to indicate exactly what file is being used, after all lookup/de-mapping logic is done, e.g. I made a symlink to test this out:
This is similar to all the other informational messages for table sources and app sources indicating where they were found.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.