diff options
| author | dirkbaechle <dl9obn@darc.de> | 2015-04-05 10:17:21 (GMT) |
|---|---|---|
| committer | dirkbaechle <dl9obn@darc.de> | 2015-04-05 10:17:21 (GMT) |
| commit | 079dcc3b635370801480d7f51fbc13ef8d628e8c (patch) | |
| tree | c359d57bf21aa86bd272ace53785288050dd941e /src | |
| parent | 3b45927301d3dd1d5af54798c85b8f80c6571678 (diff) | |
| parent | dae900cb134bc4fc74943f2c5a1f6a6303f9aa61 (diff) | |
| download | SCons-079dcc3b635370801480d7f51fbc13ef8d628e8c.zip SCons-079dcc3b635370801480d7f51fbc13ef8d628e8c.tar.gz SCons-079dcc3b635370801480d7f51fbc13ef8d628e8c.tar.bz2 | |
Merged in williamblevins/scons_20150323 (pull request #227)
Issue 2395: Symlink support hotfix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Defaults.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 3f60bc0..6500443 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -198,11 +198,10 @@ def copy_func(dest, src, symlinks=True): shutil.copy2(file, dest) return 0 elif os.path.islink(src): - linkto = os.readlink(src) if symlinks: - return os.symlink(linkto, dest) + return os.symlink(os.readlink(src), dest) else: - return copy_func(dest, linkto, symlinks) + return copy_func(dest, os.path.realpath(src)) elif os.path.isfile(src): return shutil.copy2(src, dest) else: |