From 850b2225f5aa580a0918e2f779530bc3771c6780 Mon Sep 17 00:00:00 2001 From: zhangbo Date: Tue, 1 Nov 2022 10:20:21 +0800 Subject: [PATCH 1/3] Fix Mac/Extras.install.py File filter bug --- Mac/Extras.install.py | 6 ++---- .../macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst | 1 + 2 files changed, 3 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 ab1af71dfd823f..fa2e2f1149b567 100644 --- a/Mac/Extras.install.py +++ b/Mac/Extras.install.py @@ -9,10 +9,8 @@ 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', '.DS_store', '.DS_Store', '.svn'): + 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 00000000000000..196eb0ef948fce --- /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. From e16084f4bb58e833100b887e368df6365967ad71 Mon Sep 17 00:00:00 2001 From: zhangbo Date: Tue, 15 Nov 2022 14:00:59 +0800 Subject: [PATCH 2/3] Update Extras.install.py --- Mac/Extras.install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mac/Extras.install.py b/Mac/Extras.install.py index fa2e2f1149b567..41bfa53d616307 100644 --- a/Mac/Extras.install.py +++ b/Mac/Extras.install.py @@ -9,8 +9,9 @@ debug = 0 def isclean(name): - if name in ('CVS', '.cvsignore', '.DS_store', '.DS_Store', '.svn'): + 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 From 1ff3949d0d70e0141f3298734d1e0a91e4b3fba0 Mon Sep 17 00:00:00 2001 From: zhangbo Date: Tue, 15 Nov 2022 14:03:12 +0800 Subject: [PATCH 3/3] Update Misc/NEWS.d/next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst fix news.d Co-authored-by: Nikita Sobolev --- .../next/macOS/2022-11-01-10-32-23.gh-issue-98940.W3YzC_.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 196eb0ef948fce..18ef0b0e252322 100644 --- 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 @@ -1 +1 @@ -Fix Mac/Extras.install.py File Filter Bug. +Fix ``Mac/Extras.install.py`` file filter bug.