Avoid jinja eating the whitespace after the platform identifier in fixes#3138
Merged
redhatrises merged 2 commits intoComplianceAsCode:masterfrom Jul 18, 2018
Merged
Avoid jinja eating the whitespace after the platform identifier in fixes#3138redhatrises merged 2 commits intoComplianceAsCode:masterfrom
redhatrises merged 2 commits intoComplianceAsCode:masterfrom
Conversation
added 2 commits
July 18, 2018 17:25
Because warnings didn't work well for us...
mpreisler
added
the
BLOCKER
mpreisler
changed the title
|
The inspection completed: No new issues |
Contributor
|
Ack |
cipherboy
added a commit
to cipherboy/scap-security-guide
that referenced
this pull request
Jul 24, 2018
- In PR#3133, various ovals were reorganized from debian8 to the shared location - Other PRs (including ComplianceAsCode#3138 and 3146) made the merge possible - In PR#3129, the switch was made to use the linux_os/guide folder for debian8 This commit removes the unused debian8/guide folder to prevent new contributions to it. These changes should instead be made to linux_os/guide such that they are shared across linux platforms and to reduce maintenance efforts. Signed-off-by: Alexander Scheel <ascheel@redhat.com>
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
3 participants
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.
I have caused 2 regressions while unshadowing the bash fixes. The platform line was being joined with the next line, the resulting bash fix was therefore not valid and even the platform comment couldn't be parsed. This fixes that. I also made the build script fatal error when the platform identifier is missing. This is the only thing that works because we can't always rely on a thorough review.