Merge branch 'master' into release-prep

2026-01-04 19:10:09 +01:00 · 2017-04-04 13:20:28 -07:00
parent 6ae8a86d60 8ce1232758
commit 4fd36fd137
2 changed files with 2 additions and 4 deletions
--- a/setup.py
+++ b/setup.py
@@ -265,7 +265,6 @@ def wx_copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
    else:
        # make a new, matching symlink in dst
        if os.path.isdir(dst):
-            dir = dst
            dst = os.path.join(dst, os.path.basename(src))
        linkdst = os.readlink(src)
        if verbose >= 1: