New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
o/devicestate: raise conflict when requesting system action while seeding #8689
Merged
pedronis
merged 14 commits into
snapcore:master
from
bboozzoo:bboozzoo/system-actions-conflicts
May 21, 2020
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
96049c2
o/devicestate: verify conflicts with seeding when system action is re…
bboozzoo 23c03e5
daemon: update systems unit tests to check system action vs seeding c…
bboozzoo 29a4f43
o/devicestate: move system seeds related helpers to separate file
bboozzoo 9443726
Merge remote-tracking branch 'upstream/master' into bboozzoo/system-a…
bboozzoo 178e06b
Merge remote-tracking branch 'upstream/master' into bboozzoo/system-a…
bboozzoo ee37077
o/devicestate: simplify conflict checks, look at modenv recovery system
bboozzoo 5b97dc6
daemon: update system request unit tests
bboozzoo a79f564
Merge remote-tracking branch 'upstream/master' into bboozzoo/system-a…
bboozzoo 113dfae
o/devicestate: complain in system action on UC16/UC18 systems where t…
bboozzoo 925cb24
daemon: update mocking for UC20 system action
bboozzoo 0a18817
o/devicestate: set change kind in conflict errors
bboozzoo b618317
Merge remote-tracking branch 'upstream/master' into bboozzoo/system-a…
bboozzoo ed546c2
o/devicestate: drop uc16/18 check based on mode, use system mode acce…
bboozzoo 1559469
Merge remote-tracking branch 'upstream/master' into bboozzoo/system-a…
bboozzoo File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mmh, we don't do this anywhere else, usually we use the grade unset of the model to know if we are on uc16/18. we need to think a bit.