Skip to content

Simplification of updater CLI options #157

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.

Sign up for GitHub

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

Merged
marmarek merged 8 commits into from
Jun 28, 2024
Merged

Simplification of updater CLI options #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
637836b
updater: return 100 if no vm chosen
piotrbartman May 8, 2024
21e7e22
updater: unify cli options with gui updater
piotrbartman May 27, 2024
b643024
updater: return 100 if no vm was updated
piotrbartman May 27, 2024
1718936
updater: add some tests
piotrbartman May 28, 2024
35a9ae0
updater: make help prettier
piotrbartman Jun 10, 2024
ad50c1b
updater: get default value of '--update-if-stale' from dom0 settings
piotrbartman Jun 11, 2024
cd36a0e
run ci tests
piotrbartman Jun 11, 2024
51f9465
updater: add --signal-no-updates flag
piotrbartman Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions vmupdate/update_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ def run(self, agent_args):
self.log.info("Update Manager: Finished, collecting success info")

stats = list(progress_bar.statuses.values())
if FinalStatus.CANCELLED in stats:
self.ret_code = max(self.ret_code, 130)
if FinalStatus.ERROR in stats:
self.ret_code = max(self.ret_code, 5)
if FinalStatus.UNKNOWN in stats:
Expand Down
10 changes: 8 additions & 2 deletions vmupdate/vmupdate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,18 @@ def main(args=None, app=qubesadmin.Qubes()):
# independent qubes first (TemplateVMs, StandaloneVMs)
ret_code_independent, templ_statuses = run_update(
independent, args, "templates and stanalones")
no_updates = all(stat == FinalStatus.NO_UPDATES for stat in templ_statuses)
# then derived qubes (AppVMs...)
ret_code_appvm, _ = run_update(derived, args)
ret_code_appvm, app_statuses = run_update(derived, args)
no_updates = all(stat == FinalStatus.NO_UPDATES for stat in app_statuses
) and no_updates

ret_code_restart = apply_updates_to_appvm(args, independent, templ_statuses)

return max(ret_code_independent, ret_code_appvm, ret_code_restart)
ret_code = max(ret_code_independent, ret_code_appvm, ret_code_restart)
if ret_code == 0 and no_updates:
return 100

@marmarek marmarek Jun 26, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could use some documentation. I'll update integration tests as several of them failed on this one...
On a second thought, is it really a good idea to exit non-zero if everything is up to date already? I realize it may be useful information for some wrapping tools, so maybe have this behavior behind some option?
BTW, this applies both to the case where update was run and there was nothing to install, and to the case where update was skipped based on some flags (like no updates-available flag, and user didn't forced an update).

return ret_code


def parse_args(args):
Expand Down