SONiC installer - fix string formatting during image type check #1197
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
jleveque
reviewed
Oct 27, 2020
sonic_installer/main.py
Outdated
Comment on lines
317
to
319
| click.echo("Image file '{}' is of a different type than running image.\n".format(url) +\ | ||
| "If you are sure you want to install this image, use -f|--force.\n" +\ | ||
| "Aborting...") |
There was a problem hiding this comment.
Are the backslashes necessary, since the entire statement is enclosed in parentheses?
There was a problem hiding this comment.
Removed them. They were redundant.
jleveque
approved these changes
Oct 27, 2020
|
Retest this please |
2 similar comments
|
Retest this please |
|
Retest this please |
|
@jleveque do you approve to merge this with the test errors that are seen? |
|
It looks like the test failures are completely unrelated, but let's try once more. |
|
Retest this please. |
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.
- What I did
sonic_installererror message misses the filename due to string formatting error.This fixes the missing string substitution in the message:
Before (note that {} is missing the variable name.):
Now:
- How I did it
- How to verify it
Verified in a DUT, the error message is now printed correctly.
- Previous command output (if the output of a command-line utility has changed)
- New command output (if the output of a command-line utility has changed)