summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradroullier <arndt@nive.co>2013-08-17 11:56:59 +0200
committeradroullier <arndt@nive.co>2013-08-17 11:56:59 +0200
commita5a8019b62ddc2f73a16799ac3107e22446a4c08 (patch)
treec4bc222d4e0d55585368f0a4ae06b7bc0f2079ac
parentedfc4f80a1240f6f5f0c41e53078a8f5d305075f (diff)
downloadpyramid-a5a8019b62ddc2f73a16799ac3107e22446a4c08.tar.gz
pyramid-a5a8019b62ddc2f73a16799ac3107e22446a4c08.tar.bz2
pyramid-a5a8019b62ddc2f73a16799ac3107e22446a4c08.zip
copy_dir() recursive overwrite fix
-rw-r--r--pyramid/scaffolds/copydir.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pyramid/scaffolds/copydir.py b/pyramid/scaffolds/copydir.py
index ba0988523..7864dd1a1 100644
--- a/pyramid/scaffolds/copydir.py
+++ b/pyramid/scaffolds/copydir.py
@@ -90,16 +90,16 @@ def copy_dir(source, dest, vars, verbosity, simulate, indent=0,
if verbosity:
out('%sRecursing into %s' % (pad, os.path.basename(full)))
copy_dir((source[0], full), dest_full, vars, verbosity, simulate,
- indent=indent+1,
- sub_vars=sub_vars, interactive=interactive,
+ indent=indent+1, sub_vars=sub_vars,
+ interactive=interactive, overwrite=overwrite,
template_renderer=template_renderer, out_=out_)
continue
elif not use_pkg_resources and os.path.isdir(full):
if verbosity:
out('%sRecursing into %s' % (pad, os.path.basename(full)))
copy_dir(full, dest_full, vars, verbosity, simulate,
- indent=indent+1,
- sub_vars=sub_vars, interactive=interactive,
+ indent=indent+1, sub_vars=sub_vars,
+ interactive=interactive, overwrite=overwrite,
template_renderer=template_renderer, out_=out_)
continue
elif use_pkg_resources: