From 5a9dc6249678cc9987cb75dd9b26b9eddd895883 Mon Sep 17 00:00:00 2001 From: Gaurav Juvekar Date: Sat, 8 Apr 2017 20:43:29 +0530 Subject: Fix the Copy-Action test case for py2/3 --- src/engine/SCons/Defaults.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index ded9539..69d5c94 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, -- cgit v0.12