Skip to content

SERVER-98187: Remove ANSI ESC code from subprocess.run output, causing regex failure to match #1603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −1
Open

SERVER-98187: Remove ANSI ESC code from subprocess.run output, causing regex failure to match #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c34be67
Remove ANSI ESC code from subprocess output, causing regex failure to…
ssooffiiaannee Dec 7, 2024
8d0ac1e
Remove read-only from removable files, averting access is denied perm…
ssooffiiaannee Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion site_scons/mongo/pip_requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,15 @@ def raiseSuggestion(ex, pip_pkg):
f" buildscripts/poetry_sync.sh -p '{executable}'\n"
)

# Remove ANSI escape codes from the output
ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
clean_output = ansi_escape.sub('', poetry_dry_run_proc.stdout)

# String match should look like the following
# Package operations: 2 installs, 3 updates, 0 removals, 165 skipped
match = re.search(
r"Package operations: (\d+) \w+, (\d+) \w+, (\d+) \w+, (\d+) \w+",
poetry_dry_run_proc.stdout,
clean_output,
)
verbose("Requirements list:")
verbose(poetry_dry_run_proc.stdout)
Expand Down
1 change: 1 addition & 0 deletions site_scons/site_tools/integrate_bazel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,7 @@ def bazel_build_thread_func(env, log_dir: str, verbose: bool, ninja_generate: bo

if ninja_generate:
for file in glob.glob("bazel-out/**/*.gen_source_list", recursive=True):
os.chmod(file, stat.S_IWRITE)
os.remove(file)
extra_args += ["--build_tag_filters=scons_link_lists"]
bazel_cmd = Globals.bazel_base_build_command + extra_args + ["//src/..."]
Expand Down