diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py index 007c95a4ea..e70daee92f 100644 --- a/bitbake/lib/bb/msg.py +++ b/bitbake/lib/bb/msg.py @@ -106,17 +106,7 @@ class BBLogFormatter(logging.Formatter): return record def enable_color(self): - import curses - try: - win = None - win = curses.initscr() - if curses.has_colors(): - self.color_enabled = True - except: - pass - finally: - if win is not None: - curses.endwin() + self.color_enabled = True class BBLogFilter(object): def __init__(self, handler, level, debug_domains): diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index a63d8b120e..be63e730f0 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py @@ -157,6 +157,8 @@ class TerminalFilter(object): new[3] = new[3] & ~termios.ECHO termios.tcsetattr(fd, termios.TCSADRAIN, new) curses.setupterm() + if curses.tigetnum("colors") > 2: + format.enable_color() self.ed = curses.tigetstr("ed") if self.ed: self.cuu = curses.tigetstr("cuu") @@ -240,17 +242,15 @@ def main(server, eventHandler, tf = TerminalFilter): console = logging.StreamHandler(sys.stdout) format_str = "%(levelname)s: %(message)s" format = bb.msg.BBLogFormatter(format_str) - if interactive: - format.enable_color() bb.msg.addDefaultlogFilter(console) console.setFormatter(format) logger.addHandler(console) if consolelogfile: bb.utils.mkdirhier(os.path.dirname(consolelogfile)) - format = bb.msg.BBLogFormatter(format_str) + conlogformat = bb.msg.BBLogFormatter(format_str) consolelog = logging.FileHandler(consolelogfile) bb.msg.addDefaultlogFilter(consolelog) - consolelog.setFormatter(format) + consolelog.setFormatter(conlogformat) logger.addHandler(consolelog) try: