From 250b93e89cc892a8026daea135005a1633bf5f51 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Wed, 8 Jun 2022 06:13:17 -0400 Subject: [PATCH] git_deploy: fix install script parsing Signed-off-by: Eric Callahan --- moonraker/components/update_manager/git_deploy.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/moonraker/components/update_manager/git_deploy.py b/moonraker/components/update_manager/git_deploy.py index 58cdf17..e145f1e 100644 --- a/moonraker/components/update_manager/git_deploy.py +++ b/moonraker/components/update_manager/git_deploy.py @@ -197,8 +197,11 @@ class GitDeploy(AppDeploy): return None event_loop = self.server.get_event_loop() data = await event_loop.run_in_thread(inst_path.read_text) - packages: List[str] = re.findall(r'PKGLIST="(.*)"', data) - packages = [p.lstrip("${PKGLIST}").strip() for p in packages] + plines: List[str] = re.findall(r'PKGLIST="(.*)"', data) + plines = [p.lstrip("${PKGLIST}").strip() for p in plines] + packages: List[str] = [] + for line in plines: + packages.extend(line.split()) if not packages: self.log_info(f"No packages found in script: {inst_path}") return None