Merge tag 'upstream/2.5.0+repack'

Upstream version 2.5.0+repack

1 files changed, 6 insertions, 3 deletions

diff --git a/bootstrap.py b/bootstrap.py
index ee58add..26ef90e 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -27,6 +27,8 @@ import os.path
 import sys
 import glob
 import subprocess
+import filecmp
+import shutil
 
 __doc__ = """bootstrap.py
 
@@ -127,7 +129,7 @@ def main():
     def must_copy(dst, src):
         if not os.path.exists(dst):
             return 1
-        return open(dst, 'rb').read() != open(src, 'rb').read()
+        return not filecmp.cmp(dst,src)
     
     # Note:  We don't use the getopt module to process the command-line
     # arguments because we'd have to teach it about all of the SCons options.
@@ -195,7 +197,8 @@ def main():
                 os.makedirs(dir)
             try: os.unlink(dst)
             except: pass
-            open(dst, 'wb').write( open(src, 'rb').read() )
+
+            shutil.copyfile(src,dst)
     
     if update_only:
         sys.exit(0)