Skip to content

Handle invalid data in COLUMNS env var when determining console width #9631

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
scollinson wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

Handle invalid data in COLUMNS env var when determining console width #9631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion lib/tools/patching.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,14 @@
from rich.syntax import Syntax

# console width is COLUMNS env var minus 12, or just 160 if GITHUB_ACTIONS env is not empty
console_width = (int(os.environ.get("COLUMNS", 160)) - 12) if os.environ.get("GITHUB_ACTIONS", "") == "" else 160
if os.environ.get("GITHUB_ACTIONS", "") == "":
try:
console_width = int(os.environ.get("COLUMNS", 160))
except ValueError:
console_width = 160
console_width = max(console_width, 120) - 12
else:
console_width = 160
console = Console(color_system="standard", width=console_width, highlight=False)

# Use Rich to print a summary of the patches
Expand Down
Loading