Merge pull request #3100 from getnikola/fix-3099

Don't walk down .DS_Store, Fix #3099
getnikola · Jun 5, 2018 · 5570293 · 5570293
2 parents e4bdaa9 + b5a4216
commit 5570293
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -13,6 +13,7 @@ Bugfixes
 --------
 
 * Implement ``MARKDOWN_EXTENSION_CONFIGS`` properly (Issue #2970)
+* Ignore ``.DS_Store`` when processing listings (Issue #3099)
 
 New in v8.0.0b2 (changes since Beta 1)
 ======================================

diff --git a/nikola/plugins/task/listings.py b/nikola/plugins/task/listings.py
@@ -222,6 +222,8 @@ def render_listing(in_name, out_name, input_folder, output_folder, folders=[], f
                     'clean': True,
                 }, self.kw["filters"])
                 for f in files:
+                    if f == '.DS_Store':
+                        continue
                     ext = os.path.splitext(f)[-1]
                     if ext in ignored_extensions:
                         continue