From ea88d34de27ba2b3acaeb03c7dc7829dff40ea5c Mon Sep 17 00:00:00 2001 From: zhangbo Date: Wed, 16 Nov 2022 17:17:18 +0800 Subject: [PATCH] gh-98940: Fix Mac/Extras.install.py File filter bug (#98943) Slightly simplify the script and fix a case issue in the name of ``.DS_Store`` files. Co-authored-by: Nikita Sobolev --- Mac/Extras.install.py | 7 +++---- .../macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst diff --git a/Mac/Extras.install.py b/Mac/Extras.install.py index ab1af71dfd8..41bfa53d616 100644 --- a/Mac/Extras.install.py +++ b/Mac/Extras.install.py @@ -9,10 +9,9 @@ verbose = 1 debug = 0 def isclean(name): - if name == 'CVS': return 0 - if name == '.cvsignore': return 0 - if name == '.DS_store': return 0 - if name == '.svn': return 0 + if name in ('CVS', '.cvsignore', '.svn'): + return 0 + if name.lower() == '.ds_store': return 0 if name.endswith('~'): return 0 if name.endswith('.BAK'): return 0 if name.endswith('.pyc'): return 0 diff --git a/Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst b/Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst new file mode 100644 index 00000000000..18ef0b0e252 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst @@ -0,0 +1 @@ +Fix ``Mac/Extras.install.py`` file filter bug.