Addon Manager: Handle symlinking failure

FreeCAD · Jan 7, 2022 · 7ea0394 · 7ea0394
1 parent 1381744
commit 7ea0394
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Mod/AddonManager/addonmanager_workers.py b/src/Mod/AddonManager/addonmanager_workers.py
@@ -1249,9 +1249,15 @@ def run_git_clone(self, clonedir: str) -> None:
             if os.path.exists(clonedir):
                 for f in os.listdir(clonedir):
                     if f.lower().endswith(".fcmacro"):
-                        utils.symlink(
-                            os.path.join(clonedir, f), os.path.join(macro_dir, f)
-                        )
+                        try:
+                            utils.symlink(
+                                os.path.join(clonedir, f), os.path.join(macro_dir, f)
+                            )
+                        except OSError:
+                            # If the symlink failed (e.g. for a non-admin user on Windows), copy the macro instead
+                            shutil.copy(
+                                os.path.join(clonedir, f), os.path.join(macro_dir, f)
+                            )
                         FreeCAD.ParamGet(
                             "User parameter:Plugins/" + self.repo.name
                         ).SetString("destination", clonedir)