From dadbb55fd2807588676b10407f59a0e5ad319f8f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lallement Date: Wed, 1 Sep 2021 19:02:55 +0200 Subject: [PATCH] Fix controller removal Properly remove unsupported controllers. Co-authored-by: Didier Roche --- subiquity/server/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/subiquity/server/server.py b/subiquity/server/server.py index cb3b6bd1..ac427326 100644 --- a/subiquity/server/server.py +++ b/subiquity/server/server.py @@ -276,8 +276,13 @@ class SubiquityServer(Application): self.snapd = AsyncSnapd(connection) else: log.info("no snapd socket found. Snap support is disabled") - self.controllers.remove("Refresh") - self.controllers.remove("SnapList") + reload_needed = False + for controller in ["Refresh", "Snaplist"]: + if controller in self.controllers.controller_names: + self.controllers.controller_names.remove(controller) + reload_needed = True + if reload_needed: + self.controllers.load_all() self.snapd = None self.note_data_for_apport("SnapUpdated", str(self.updated)) self.event_listeners = []