From: Collin Funk Date: Fri, 29 Mar 2024 13:09:20 +0000 (-0700) Subject: gnulib-tool.py: Display specified modules in bold. X-Git-Tag: v1.0~208 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=89be3fb0149cfd35d71ffa85cec60e8b3296a000;p=gnulib.git gnulib-tool.py: Display specified modules in bold. * pygnulib/GLImport.py (GLImport.prepare): Detect terminals starting with 'xterm'. Change hexadecimal numbers to octal, matching gnulib-tool.sh. * pygnulib/GLTestDir.py (GLTestDir.execute): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 72bb1819fe..931322915b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-03-29 Collin Funk + + gnulib-tool.py: Display specified modules in bold. + * pygnulib/GLImport.py (GLImport.prepare): Detect terminals starting + with 'xterm'. Change hexadecimal numbers to octal, matching + gnulib-tool.sh. + * pygnulib/GLTestDir.py (GLTestDir.execute): Likewise. + 2024-03-29 Bruno Haible attribute: Work around compiler bug of Oracle cc 12.6. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index afe751dbd3..84e1c08689 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -849,10 +849,10 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix if verbose >= 0: bold_on = '' bold_off = '' - term = os.getenv('TERM') - if term == 'xterm': - bold_on = '\x1b[1m' - bold_off = '\x1b[0m' + term = os.getenv('TERM', '') + if term.startswith('xterm') and os.isatty(1): + bold_on = '\033[1m' + bold_off = '\033[0m' print('Module list with included dependencies (indented):') for module in final_modules: if str(module) in self.config.getModules(): diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 57fbef7b06..e395090b83 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -260,10 +260,10 @@ class GLTestDir(object): if verbose >= 0: bold_on = '' bold_off = '' - term = os.getenv('TERM') - if term == 'xterm': - bold_on = '\x1b[1m' - bold_off = '\x1b[0m' + term = os.getenv('TERM', '') + if term.startswith('xterm') and os.isatty(1): + bold_on = '\033[1m' + bold_off = '\033[0m' print('Module list with included dependencies (indented):') specified_modules_set = { str(module) for module in specified_modules }