apt: fix invocation of setup_overlay in dry-run mode #2075
Merged
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
setup_overlay() expects a list of lower directories. That said, we have one invocation in dry-run mode where we pass it a path (which is a string) directly instead of wrapping the path in a list with one element. The dry-run implementation of setup_overlay() accesses the first element of the list using lowers[0], and expects a path out of it. But when lowers is a string, lowers[0] returns the first character of string, which usually is "/" and therefore corresponds to a valid path. It makes the code accidentally work, but use a path that is not the one we expected. Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
|
It also makes mypy a little bit happier \o/ @@ -675 +674,0 @@
-subiquity/server/apt.py:378: error: Argument 1 to "setup_overlay" of "Mounter" has incompatible type "str | Any"; expected "list[Mountpoint | str | OverlayMountpoint]" [arg-type]
@@ -2008 +2007 @@
-Found 1911 errors in 142 files (checked 334 source files)
+Found 1910 errors in 142 files (checked 334 source files) |
Chris-Peterson444
approved these changes
Sep 6, 2024
|
Thanks. If you can think of a more elegant way of handling dry-run mode for all this stuff, I am all ears ... |
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.
setup_overlay()expects a list of lower directories. That said, we have one invocation in dry-run mode where we pass it a path (which is a string) directly instead of wrapping the path in a list with one element.The dry-run implementation of
setup_overlay()accesses the first element of the list usinglowers[0], and expects a path out of it. But whenlowersis a string,lowers[0]returns the first character of string, which usually is"/"and therefore corresponds to a valid path.It makes the code accidentally work, but use a path that is not the one we expected.