summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2016-01-17 17:02:50 +0900
committershimizukawa <shimizukawa@gmail.com>2016-01-17 17:17:13 +0900
commit198d4a41ada737bbff02f29c350ea9641d60f6b4 (patch)
tree5ada8883ad4b09abbcccaa8b4b6794908c080583
parent3e53d017ac7339ba8eebebf02734e8daace3eada (diff)
downloadsphinx-git-198d4a41ada737bbff02f29c350ea9641d60f6b4.tar.gz
refs #2022: 'Thumbs.db' and '.DS_Store' are added to `exclude_patterns` default values in conf.py that will be provided on sphinx-quickstart.
-rw-r--r--CHANGES2
-rw-r--r--sphinx/quickstart.py6
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index ae94fde8a..a7a27cee5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ Incompatible changes
Refs #2087, #2086, #1845 and #2097. Thanks to Victor Zverovich.
* #2231: Use DUrole instead of DUspan for custom roles in LaTeX writer. It enables to take
title of roles as an argument of custom macros.
+* #2022: 'Thumbs.db' and '.DS_Store' are added to `exclude_patterns` default values in
+ conf.py that will be provided on sphinx-quickstart.
Features added
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py
index de45272ce..2f5f76cbd 100644
--- a/sphinx/quickstart.py
+++ b/sphinx/quickstart.py
@@ -1364,7 +1364,11 @@ def generate(d, overwrite=True, silent=False):
d['exclude_patterns'] = ''
else:
builddir = path.join(srcdir, d['dot'] + 'build')
- d['exclude_patterns'] = repr(d['dot'] + 'build')
+ exclude_patterns = map(repr, [
+ d['dot'] + 'build',
+ 'Thumbs.db', '.DS_Store',
+ ])
+ d['exclude_patterns'] = ', '.join(exclude_patterns)
mkdir_p(builddir)
mkdir_p(path.join(srcdir, d['dot'] + 'templates'))
mkdir_p(path.join(srcdir, d['dot'] + 'static'))