Merge pull request #1425 from ogayot/fix-try-again-not-waiting

snaplist: do not automatically mark configured on failed GET request
This commit is contained in:
Olivier Gayot 2022-09-20 11:32:26 +02:00 committed by GitHub
commit 74cad94efa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions

View File

@ -170,13 +170,11 @@ class SnapListController(SubiquityController):
async def GET(self, wait: bool = False) -> SnapListResponse:
if self.loader.failed or not self.app.base_model.network.has_network:
await self.configured()
return SnapListResponse(status=SnapCheckState.FAILED)
if not self.loader.snap_list_fetched and not wait:
return SnapListResponse(status=SnapCheckState.LOADING)
await self.loader.get_snap_list_task().wait()
if self.loader.failed or not self.app.base_model.network.has_network:
await self.configured()
return SnapListResponse(status=SnapCheckState.FAILED)
return SnapListResponse(
status=SnapCheckState.DONE,