From d77584db10fbf90a1df574eba3edf561c4315e97 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 15 Sep 2022 13:12:43 -0500 Subject: [PATCH] Addon Manager: Clean up backup directories --- src/Mod/AddonManager/addonmanager_git.py | 1 + src/Mod/AddonManager/addonmanager_workers_installation.py | 2 +- src/Mod/AddonManager/developer_mode_edit_dependency.ui | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Mod/AddonManager/addonmanager_git.py b/src/Mod/AddonManager/addonmanager_git.py index a3703927a8..1ca7864542 100644 --- a/src/Mod/AddonManager/addonmanager_git.py +++ b/src/Mod/AddonManager/addonmanager_git.py @@ -231,6 +231,7 @@ class GitManager: os.chdir(original_cwd) raise e os.chdir(original_cwd) + shutil.rmtree(backup_path, ignore_errors=True) def get_remote(self, local_path) -> str: """Get the repository that this local path is set to fetch from""" diff --git a/src/Mod/AddonManager/addonmanager_workers_installation.py b/src/Mod/AddonManager/addonmanager_workers_installation.py index 18207f68df..16df87c5cd 100644 --- a/src/Mod/AddonManager/addonmanager_workers_installation.py +++ b/src/Mod/AddonManager/addonmanager_workers_installation.py @@ -147,7 +147,7 @@ class InstallWorkbenchWorker(QtCore.QThread): will revert to a clean clone.""" self.status_message.emit("Updating module...") with self.repo.git_lock: - if not os.path.exists(clonedir + os.sep + ".git"): + if not os.path.exists(os.path.join(clonedir, ".git")): self.git_manager.repair(self.repo.url, clonedir) try: self.git_manager.update(clonedir) diff --git a/src/Mod/AddonManager/developer_mode_edit_dependency.ui b/src/Mod/AddonManager/developer_mode_edit_dependency.ui index ca127523a1..07b0b46dee 100644 --- a/src/Mod/AddonManager/developer_mode_edit_dependency.ui +++ b/src/Mod/AddonManager/developer_mode_edit_dependency.ui @@ -51,7 +51,7 @@ - NOTE: If "Other..." is selected, the package is not in the ALLOWED_PYTHON_PACKAGES.txt file, and will not be automatically installed by the Addon Manager. Submit a PR at <a href=https://github.com/FreeCAD/FreeCAD-addons">https://github.com/FreeCAD/FreeCAD-addons</a> to request addition of a package. + NOTE: If "Other..." is selected, the package is not in the ALLOWED_PYTHON_PACKAGES.txt file, and will not be automatically installed by the Addon Manager. Submit a PR at <a href="https://github.com/FreeCAD/FreeCAD-addons">https://github.com/FreeCAD/FreeCAD-addons</a> to request addition of a package. true