seed/seedwriter: consider modes when checking for deps availability #9710
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
the code before wasn't taking into account the modes in which the base or default content providers were available vs the modes of the dependent snap, with the changes here it now does
bboozzoo
approved these changes
Nov 30, 2020
seed/seedwriter/seed20.go
Outdated
| if mode == "run" || mode == "ephemeral" { | ||
| return false | ||
| } | ||
| // consider ephemeral as well |
There was a problem hiding this comment.
I think we could extend the comment a bit, eg.
// all non-run modes (eg. recover) are considered ephemeral,
// as a fallback check if the snap is listed for an ephemeral mode
| byMode := availableByMode[mode] | ||
| if !byMode.Contains(snapRef) { | ||
| if mode == "run" || mode == "ephemeral" { | ||
| return false |
There was a problem hiding this comment.
// no additional fallback check for well known modes
| @@ -90,6 +90,13 @@ type SeedSnap struct { | |||
| optionSnap *OptionsSnap | |||
| } | |||
|
|
|||
| func (sn *SeedSnap) modes() []string { | |||
| if sn.modelSnap == nil { | |||
| return []string{"run"} | |||
There was a problem hiding this comment.
// default mode for extra snaps not listed in the model
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.
the code before wasn't taking into account the modes in which
the base or default content providers were available vs
the modes of the dependent snap, with the changes here
it now does
fixes LP: #1883970