StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak when x-status: confirm gets sent

This commit is contained in:
Michael Hudson-Doyle 2021-08-05 16:18:18 +12:00
parent e7d2959625
commit 9080a56804
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
subiquity/models/subiquity.py
View File

@ -165,10 +165,9 @@ class SubiquityModel:
async def wait_confirmation(self):
await self._confirmation.wait()
def needs_configuration(self, model_name):
if model_name is None:
return False
return model_name not in self._configured_names
def is_postinstall_only(self, model_name):
return model_name in self._cur_postinstall_model_names and \
model_name not in self._cur_install_model_names
def confirm(self):
self._confirmation.set()

2
subiquity/server/server.py
View File

@ -376,7 +376,7 @@ class SubiquityServer(Application):
if not controller.interactive():
override_status = 'skip'
elif self.state == ApplicationState.NEEDS_CONFIRMATION:
if self.base_model.needs_configuration(controller.model_name):
if self.base_model.is_postinstall_only(controller.model_name):
override_status = 'confirm'
if override_status is not None:
resp = web.Response(headers={'x-status': override_status})