Fix newlines #132
Merged
Fix newlines #132
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
mcg1969
commented
Feb 9, 2025
| @@ -167,4 +167,4 @@ jobs: | |||
| source $CONDA/bin/activate | |||
| conda install anaconda-client | |||
| [[ "$GITHUB_REF" =~ ^refs/tags/ ]] || export LABEL="--label dev" | |||
| anaconda --verbose --token $ANACONDA_TOKEN upload --user ctools $LABEL conda-bld/*/*.tar.bz2 --force | |||
| anaconda --verbose --token $ANACONDA_TOKEN upload --user ctools $LABEL conda-bld/*/*.{conda,tar.bz2} --force | |||
There was a problem hiding this comment.
also noticed that uploads were broken
mcg1969
commented
Feb 9, 2025
| @@ -43,9 +43,9 @@ def system_tokens(): | |||
| otoken = utils._random_token() | |||
| mtoken = utils._random_token() | |||
| with open(dirname(tpaths[1]) + "/org_token", "w") as fp: | |||
| fp.write(otoken) | |||
| fp.write(otoken + "\n# Anaconda organization token\n") | |||
There was a problem hiding this comment.
Force some extra lines in the test tokens
jezdez
approved these changes
Feb 11, 2025
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.
I discovered that newlines were sometimes making it into the user agent string—specifically if external utilities were creating the organization and machine tokens. This hardens the token reading code against this