Bug 209850 – [Flatpak SDK] Migration to version 0.2

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Philippe Normand]

.

[Philippe Normand]

Created attachment 395154 [details]
Patch

[Philippe Normand]

$ webkit-flatpak --command=bash
[📦 org.webkit.Webkit WebKit]$ rr --version
rr version 5.3.0
[📦 org.webkit.Webkit WebKit]$ pkg-config --cflags --libs manette-0.2
-I/usr/include/libmanette -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -lmanette-0.2 -lglib-2.0 
[📦 org.webkit.Webkit WebKit]$ pkg-config --cflags --libs openxr
-lopenxr_loader -lpthread 
[📦 org.webkit.Webkit WebKit]$

[Carlos Alberto Lopez Perez]

Comment on attachment 395154 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=395154&action=review

> Tools/flatpak/flatpakutils.py:103
> +    @classmethod
> +    def colored_message(cls, color, str_format, *args):
> +        if args:
> +            msg = str_format % args
> +        else:
> +            msg = str_format
> +
> +        cls.message("\n%s%s%s", color, msg, Colors.ENDC)
> +
> +    @classmethod
> +    def error_message(cls, str_format, *args):
> +        cls.colored_message(Colors.FAIL, str_format, *args)
> +
> +    @classmethod
> +    def warning_message(cls, str_format, *args):
> +        cls.colored_message(Colors.WARNING, str_format, *args)

Our bots run with environment variable TERM=dumb to disable colored output, since this ANSI colors looks bad on a text log.
Can you check if the terminal supports colors and only output ANSI color characters in that case?
Here is a suggested code for that: http://sprunge.us/wSNHtz

And a test:

$ wget http://sprunge.us/wSNHtz
$ python wSNHtz
True

$ TERM=dumb python wSNHtz
False

[Philippe Normand]

Good point Carlos, I'll add code to check the TERM env var. Thanks for the review!

[Philippe Normand]

(In reply to Philippe Normand from comment #4)
> Good point Carlos, I'll add code to check the TERM env var. Thanks for the
> review!

I mean, the code you mentioned :)

[Philippe Normand]

Committed r259341: <https://trac.webkit.org/changeset/259341>

[Radar WebKit Bug Importer]

<rdar://problem/61154885>