From aaff737bd6f7877aa2cae848ed1431754bc8facf Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Mon, 20 Dec 2021 13:12:45 -0600 Subject: [PATCH] Addon Manager: Fix macro update code --- src/Mod/AddonManager/addonmanager_workers.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Mod/AddonManager/addonmanager_workers.py b/src/Mod/AddonManager/addonmanager_workers.py index 0042fc798d..9020ba3178 100644 --- a/src/Mod/AddonManager/addonmanager_workers.py +++ b/src/Mod/AddonManager/addonmanager_workers.py @@ -1575,14 +1575,12 @@ class UpdateSingleWorker(QtCore.QThread): FreeCAD.getUserCachePath(), "AddonManager", "MacroCache" ) os.makedirs(cache_path, exist_ok=True) - temp_install_succeeded = macro.install(cache_path) - if not temp_install_succeeded: - failed = True + install_succeeded, errors = repo.macro.install(cache_path) - if not failed: - failed = macro.install(self.macro_repo_dir) + if install_succeeded: + install_succeeded, errors = repo.macro.install(FreeCAD.getUserMacroDir()) - if not failed: + if install_succeeded: self.success.emit(repo) else: self.failure.emit(repo)