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

Merge pull request #1234 from mwhudson/lp-1962205 

never return a PROBING response from guided_POST
This commit is contained in:
Dan Bungert 2022-03-18 09:17:32 -06:00 committed by GitHub
parent 84aee8e20e 4c59e1ee9b
commit 80c3c7879c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
subiquity/server/controllers/filesystem.py
View File

@ -223,10 +223,7 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
else:
return None
async def GET(self, wait: bool = False) -> StorageResponse:
probe_resp = await self._probe_response(wait, StorageResponse)
if probe_resp is not None:
return probe_resp
def _done_response(self):
return StorageResponse(
status=ProbeStatus.DONE,
bootloader=self.model.bootloader,
@ -237,6 +234,12 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
dasd=self.model._probe_data.get('dasd', {}),
storage_version=self.model.storage_version)
async def GET(self, wait: bool = False) -> StorageResponse:
probe_resp = await self._probe_response(wait, StorageResponse)
if probe_resp is not None:
return probe_resp
return self._done_response()
async def POST(self, config: list):
log.debug(config)
self.model._actions = self.model._actions_from_config(
@ -277,7 +280,7 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
async def guided_POST(self, data: GuidedChoice) -> StorageResponse:
log.debug(data)
self.guided(data)
return await self.GET()
return self._done_response()
async def reset_POST(self, context, request) -> StorageResponse:
log.info("Resetting Filesystem model")