Skip to content

Commit

Permalink
update_manager: fix klipper path regression
Browse files Browse the repository at this point in the history
Commit 7401192 introduced a regression where the saved klipper
paths were not loaded into the Update object.

Signed-off-by:  Eric Callahan <[email protected]>
  • Loading branch information
Arksine committed Jan 29, 2022
1 parent 287982a commit b4ad669
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions moonraker/components/update_manager/update_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit b4ad669

Please sign in to comment.