[Python-checkins] cpython (merge 3.4 -> default): Closes #21663: Merged fix from 3.4.

[vinay.sajip]

http://hg.python.org/cpython/rev/1ed9edde3bfc
changeset:   91030:1ed9edde3bfc
parent:      91028:4d12a29a25f4
parent:      91029:477e71004040
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Thu Jun 05 09:32:24 2014 +0100
summary:
  Closes #21663: Merged fix from 3.4.

files:
  Lib/venv/__init__.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -238,7 +238,8 @@
                 if 'init.tcl' in files:
                     tcldir = os.path.basename(root)
                     tcldir = os.path.join(context.env_dir, 'Lib', tcldir)
-                    os.makedirs(tcldir)
+                    if not os.path.exists(tcldir):
+                        os.makedirs(tcldir)
                     src = os.path.join(root, 'init.tcl')
                     dst = os.path.join(tcldir, 'init.tcl')
                     shutil.copyfile(src, dst)

-- 
Repository URL: http://hg.python.org/cpython