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

mirror: avoid assertion error if the source changes at the wrong time 

When the source model changes, the mirror model gets notified and
replaces the "apt configurer" instance with a new one. If this happens
in the middle of a "deploy apt configuration + run apt-get update"
operation, this leads to an assertion error.

Fixed by making sure we do the entire operation on the same "apt
configurer" instance.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2023-04-12 11:25:05 +02:00
parent 9b13e0b0ee
commit 938f2ffc24
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subiquity/server/controllers/mirror.py
View File

@ -314,9 +314,14 @@ class MirrorController(SubiquityController):
async def run_mirror_testing(self, output: io.StringIO) -> None:
await self.source_configured_event.wait()
await self.test_apt_configurer.apply_apt_config(
# If the source model changes at the wrong time, there is a chance that
# self.test_apt_configurer will be replaced between the call to
# apply_apt_config and run_apt_config_check. Just make sure we still
# use the original one.
configurer = self.test_apt_configurer
await configurer.apply_apt_config(
self.context, final=False)
await self.test_apt_configurer.run_apt_config_check(output)
await configurer.run_apt_config_check(output)
async def wait_config(self) -> AptConfigurer:
self.final_apt_configurer = get_apt_configurer(