summaryrefslogtreecommitdiff
path: root/sphinx/cmd/quickstart.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2017-12-14 23:26:27 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2017-12-14 23:26:27 +0900
commitea61464706b9d5cf33f32c89ff6451e6ab2519a2 (patch)
tree1aef728d811ad30d7c7e185c94b541455d5be714 /sphinx/cmd/quickstart.py
parenta722c3f2bfbcbce15f95143622f8dc46336a148d (diff)
parent49e1fbe0df95267f1b1e9e5f606fa8398cfba44b (diff)
downloadsphinx-git-ea61464706b9d5cf33f32c89ff6451e6ab2519a2.tar.gz
Merge branch 'stable'
Diffstat (limited to 'sphinx/cmd/quickstart.py')
-rw-r--r--sphinx/cmd/quickstart.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py
index 46d42f10b..af07d4978 100644
--- a/sphinx/cmd/quickstart.py
+++ b/sphinx/cmd/quickstart.py
@@ -435,11 +435,13 @@ def generate(d, overwrite=True, silent=False, templatedir=None):
def write_file(fpath, content, newline=None):
# type: (unicode, unicode, unicode) -> None
if overwrite or not path.isfile(fpath):
- print('Creating file %s.' % fpath)
+ if 'quiet' not in d:
+ print('Creating file %s.' % fpath)
with open(fpath, 'wt', encoding='utf-8', newline=newline) as f:
f.write(content)
else:
- print('File %s already exists, skipping.' % fpath)
+ if 'quiet' not in d:
+ print('File %s already exists, skipping.' % fpath)
conf_path = os.path.join(templatedir, 'conf.py_t') if templatedir else None
if not conf_path or not path.isfile(conf_path):