summaryrefslogtreecommitdiff
path: root/engine/SCons/Defaults.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-06-21 07:06:07 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-06-21 07:06:07 +0200
commitb0f56d74df2a6904ddceb963833d4ea357251853 (patch)
treecad0dca521f39475abf774e513b7883ee96ea13d /engine/SCons/Defaults.py
parent665e78e013bc207a5ec35e4bc41daf2e464f6ed3 (diff)
Imported Upstream version 2.3.5upstream/2.3.5
Diffstat (limited to 'engine/SCons/Defaults.py')
-rw-r--r--engine/SCons/Defaults.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/engine/SCons/Defaults.py b/engine/SCons/Defaults.py
index 89ef1d6..42900d2 100644
--- a/engine/SCons/Defaults.py
+++ b/engine/SCons/Defaults.py
@@ -10,7 +10,7 @@ from distutils.msvccompiler.
"""
#
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@ from distutils.msvccompiler.
#
from __future__ import division
-__revision__ = "src/engine/SCons/Defaults.py 2014/09/27 12:51:43 garyo"
+__revision__ = "src/engine/SCons/Defaults.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
import os
@@ -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: