Merge changes from github.

Change: 136750267

1 files changed, 8 insertions, 3 deletions

diff --git a/tensorflow/tools/git/gen_git_source.py b/tensorflow/tools/git/gen_git_source.py
index 8b02c09064..db9de3f816 100755
--- a/tensorflow/tools/git/gen_git_source.py
+++ b/tensorflow/tools/git/gen_git_source.py
@@ -112,9 +112,14 @@ def configure(src_base_path, debug=False):
     if src is None:
       open(os.path.join(gen_path, target), "w").write("")
     else:
-      if hasattr(os, 'symlink'):
-        os.symlink(src, os.path.join(gen_path, target))
-      else:
+      try:
+        # In python 3.5, symlink function exists even on Windows. But requires
+        # Windows Admin privileges, otherwise an OSError will be thrown.
+        if hasattr(os, 'symlink'):
+          os.symlink(src, os.path.join(gen_path, target))
+        else:
+          shutil.copy2(src, os.path.join(gen_path, target))
+      except OSError:
         shutil.copy2(src, os.path.join(gen_path, target))
 
   json.dump(spec, open(os.path.join(gen_path, "spec.json"), "w"), indent=2)