(#2851) fix license validation output #2857
Open
+200
−185
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
.editorconfig file says all files should be CRLF. When editing the recipe.cake with .editorconfig support, vscode wants to change the line endings every time the file is saved. As there's no reason to keep the file LF only, it seems reasonable to normalize the line endings before making any other changes.
Chocolatey.Cake.Recipe version 0.17.0 included support for building from a branch that starts with a number. Bumping to this version allows us to work with a branch name that starts with numbers without needing to jump through any hoops.
The LicenseValidation logging logic was only checking for `-v` or `--version` as the first arguments. This completely ignored `-r`, `--limit-output`, and `--limitoutput`. Additionally, a few places weren't suppressing output when limit output was used. This change correctly detects if regular output is desired, and if it is then it marks the output accordingly, otherwise it outputs to the log file only.
|
Question regarding some tests for this: I checked out the
|
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.
Description Of Changes
Update the logic used in LicenseValidation class to correctly detect when regular output is desired and when it's not.
Motivation and Context
When there are certain license conditions, Chocolatey would report things to standard output even if the command issues was requesting to limit output.
Testing
licensedirectory and ranchoco list --local-only --limit-outputchoco list --local-only --limitoutputchoco list --local-only -rlicense/chocolatey.license.xml. Noted that limit output prevented the message about the license being invalidThis is currently a draft PR as I intend to add some Pester tests to verify that no extraneous output occurs when limit output is requested.
Change Types Made
Related Issue
Fixes #2851
Change Checklist