summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Juvekar <gauravjuvekar@gmail.com>2017-04-08 20:43:29 +0530
committerGaurav Juvekar <gauravjuvekar@gmail.com>2017-04-08 20:43:29 +0530
commit5a9dc6249678cc9987cb75dd9b26b9eddd895883 (patch)
tree69a163930d78f2a313aa89caa54b653e852de31c
parent5b713da0b1c7b56b8eeff30f26e87f72dda8c901 (diff)
downloadscons-git-5a9dc6249678cc9987cb75dd9b26b9eddd895883.tar.gz
Fix the Copy-Action test case for py2/3
-rw-r--r--src/engine/SCons/Defaults.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index ded953928..69d5c943c 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -264,7 +264,10 @@ def copy_func(dest, src, symlinks=True):
shutil.copy2(src, dest)
return 0
else:
- return shutil.copytree(src, dest, symlinks)
+ shutil.copytree(src, dest, symlinks)
+ # copytree returns None in python2 and destination string in python3
+ # A error is raised in both cases, so we can just return 0 for success
+ return 0
Copy = ActionFactory(
copy_func,