From f40abe153a108535ef3034e9cec61e96a38444f2 Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Wed, 13 May 2020 19:30:12 +0100 Subject: [PATCH] [AddonManager] Fix bug when Multiple Wbs updated See discussion https://forum.freecadweb.org/viewtopic.php?f=3&t=46322 --- src/Mod/AddonManager/addonmanager_workers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Mod/AddonManager/addonmanager_workers.py b/src/Mod/AddonManager/addonmanager_workers.py index 0f1e04e1ef..9f3668b437 100644 --- a/src/Mod/AddonManager/addonmanager_workers.py +++ b/src/Mod/AddonManager/addonmanager_workers.py @@ -588,8 +588,6 @@ class InstallWorker(QtCore.QThread): "installs or updates the selected addon" git = None - if sys.version_info.major > 2 and self.repos[self.idx][0] in PY2ONLY: - FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "User requested installing/updating a Python 2 workbench on a system running Python 3 - ")+str(self.repos[self.idx][0])+"\n") try: import git except Exception as e: @@ -623,6 +621,8 @@ class InstallWorker(QtCore.QThread): self.progressbar_show.emit(True) if os.path.exists(clonedir): self.info_label.emit("Updating module...") + if sys.version_info.major > 2 and str(self.repos[idx][0]) in PY2ONLY: + FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "User requested updating a Python 2 workbench on a system running Python 3 - ")+str(self.repos[idx][0])+"\n") if git: if not os.path.exists(clonedir + os.sep + '.git'): # Repair addon installed with raw download @@ -655,6 +655,8 @@ class InstallWorker(QtCore.QThread): self.info_label.emit("Checking module dependencies...") depsok,answer = self.checkDependencies(self.repos[idx][1]) if depsok: + if sys.version_info.major > 2 and str(self.repos[idx][0]) in PY2ONLY: + FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "User requested installing a Python 2 workbench on a system running Python 3 - ")+str(self.repos[idx][0])+"\n") if git: self.info_label.emit("Cloning module...") repo = git.Repo.clone_from(self.repos[idx][1], clonedir, branch='master')