Skip to content

Commit cbe4966

Browse files
committed
Do not return warning message on macOS
we now can handle correcty the shortcomings of Apple AFS FS Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent b16cae0 commit cbe4966

1 file changed

Lines changed: 0 additions & 15 deletions

File tree

src/scancode/extract_cli.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
from commoncode import fileutils
3737
from commoncode import filetype
3838
from commoncode.text import toascii
39-
from commoncode.system import on_macos_14_or_higher
4039

4140
from scancode_config import __version__
4241
from scancode.api import extract_archives
@@ -47,18 +46,6 @@
4746
echo_stderr = partial(click.secho, err=True)
4847

4948

50-
def print_macos_warning(quiet=False):
51-
if not quiet and on_macos_14_or_higher:
52-
echo_stderr('!!! WARNING !!!'
53-
'You are running a version of macOS that is using the APFS '
54-
'filesystem. To avoid incorrect and misleading archive extraction '
55-
'you should ensure that the disk that contains the files to extract '
56-
'has been formatted to be case-sensitive for file names by using the '
57-
'"APFS (Case-sensitive)" format when creating the filesystem with Diskutil. '
58-
'Otherwise it is possible that some archive that contain mixed-case '
59-
'names may not be correctly extracted.')
60-
61-
6249
def print_version(ctx, param, value):
6350
if not value or ctx.resilient_parsing:
6451
return
@@ -114,7 +101,6 @@ def extractcode(ctx, input, verbose, quiet, shallow, replace_originals, *args, *
114101
Archives found inside an extracted archive are extracted recursively.
115102
Extraction is done in-place in a directory named '-extract' side-by-side with an archive.
116103
"""
117-
print_macos_warning(quiet)
118104

119105
abs_location = fileutils.as_posixpath(os.path.abspath(os.path.expanduser(input)))
120106

@@ -194,7 +180,6 @@ def display_extract_summary():
194180
has_extract_errors = has_extract_errors or xev.errors
195181

196182
rc = 1 if has_extract_errors else 0
197-
print_macos_warning(quiet)
198183
ctx.exit(rc)
199184

200185

0 commit comments

Comments
 (0)