From b4ad6692e30c25191c789d0deb16740a1c0c3f21 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Sat, 29 Jan 2022 11:02:58 -0500 Subject: [PATCH] update_manager: fix klipper path regression Commit 7401192 introduced a regression where the saved klipper paths were not loaded into the Update object. Signed-off-by: Eric Callahan --- .../components/update_manager/update_manager.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/moonraker/components/update_manager/update_manager.py b/moonraker/components/update_manager/update_manager.py index af98d45ea..b51132564 100644 --- a/moonraker/components/update_manager/update_manager.py +++ b/moonraker/components/update_manager/update_manager.py @@ -87,20 +87,20 @@ def __init__(self, config: ConfigHelper) -> None: if config.getboolean('enable_system_updates', True): self.updaters['system'] = PackageDeploy(config, self.cmd_helper) db: DBComp = self.server.lookup_component('database') - kpath = db.get_item("moonraker", "klipper_path", + kpath = db.get_item("moonraker", "update_manager.klipper_path", KLIPPER_DEFAULT_PATH) - kenv_path = db.get_item("moonraker", "klipper_exec", + kenv_path = db.get_item("moonraker", "update_manager.klipper_exec", KLIPPER_DEFAULT_EXEC) if ( os.path.exists(kpath) and os.path.exists(kenv_path) ): - self.updaters['klipper'] = get_deploy_class(KLIPPER_DEFAULT_PATH)( + self.updaters['klipper'] = get_deploy_class(kpath)( self.app_config[f"update_manager klipper"], self.cmd_helper, { 'channel': self.channel, - 'path': KLIPPER_DEFAULT_PATH, - 'executable': KLIPPER_DEFAULT_EXEC + 'path': kpath, + 'executable': kenv_path }) else: self.updaters['klipper'] = BaseDeploy( @@ -213,8 +213,8 @@ async def _set_klipper_repo(self) -> None: return # Update paths in the database db: DBComp = self.server.lookup_component('database') - db.insert_item("moonraker", "klipper_path", kpath) - db.insert_item("moonraker", "klipper_exec", executable) + db.insert_item("moonraker", "update_manager.klipper_path", kpath) + db.insert_item("moonraker", "update_manager.klipper_exec", executable) need_notification = not isinstance(kupdater, AppDeploy) self.updaters['klipper'] = get_deploy_class(kpath)( self.app_config[f"update_manager klipper"], self.cmd_helper,