Handle invalid data in COLUMNS env var when determining console width

Author: scollinson

lib/tools/patching.py

@@ -444,7 +444,15 @@
 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))
+		console_width = max(console_width, 120)
+	except ValueError:
+		console_width = 160
+	console_width -= 12
+else:
+	console_width = 160
 console = Console(color_system="standard", width=console_width, highlight=False)
 
 # Use Rich to print a summary of the patches