Modified: trunk/Tools/ChangeLog (233678 => 233679)
--- trunk/Tools/ChangeLog 2018-07-10 06:23:53 UTC (rev 233678)
+++ trunk/Tools/ChangeLog 2018-07-10 08:21:26 UTC (rev 233679)
@@ -1,3 +1,15 @@
+2018-07-10 Thibault Saunier <[email protected]>
+
+ [Flatpak] Use logging to print debug information
+ https://bugs.webkit.org/show_bug.cgi?id=187496
+
+ Reviewed by Philippe Normand.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.load_from_args):
+ (WebkitFlatpak.clean_args):
+ (WebkitFlatpak.run_in_sandbox):
+
2018-07-09 Timothy Hatcher <[email protected]>
Semantic colors don't update when accessibility Increase Contrast mode is enabled.
Modified: trunk/Tools/flatpak/flatpakutils.py (233678 => 233679)
--- trunk/Tools/flatpak/flatpakutils.py 2018-07-10 06:23:53 UTC (rev 233678)
+++ trunk/Tools/flatpak/flatpakutils.py 2018-07-10 08:21:26 UTC (rev 233679)
@@ -15,6 +15,7 @@
# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301, USA.
import argparse
+import logging
try:
import configparser
except ImportError:
@@ -31,6 +32,7 @@
from webkitpy.common.system.systemhost import SystemHost
from webkitpy.port.factory import PortFactory
+from webkitpy.common.system.logutils import configure_logging
try:
from urllib.parse import urlparse # pylint: disable=E0611
@@ -48,6 +50,7 @@
]
scriptdir = os.path.abspath(os.path.dirname(__file__))
+_log = logging.getLogger(__name__)
class Colors:
@@ -449,6 +452,8 @@
parser = argparse.ArgumentParser(prog="webkit-flatpak")
general = parser.add_argument_group("General")
+ general.add_argument('--verbose', action='',
+ help='Show debug message')
general.add_argument("--debug",
help="Compile with Debug configuration, also installs Sdk debug symboles.",
action=""
@@ -512,6 +517,7 @@
self.sdk_debug = None
self.app = None
+ self.verbose = True
self.quiet = False
self.packs = []
self.update = False
@@ -556,6 +562,7 @@
self.makeargs = ""
def clean_args(self):
+ configure_logging(logging.DEBUG if self.verbose else logging.INFO)
if not self.debug and not self.release:
factory = PortFactory(SystemHost())
port = factory.get(self.platform)
@@ -693,7 +700,7 @@
tmpscript.write(shell_string)
tmpscript.flush()
- Console.message('Running in sandbox: "%s" %s\n' % ('" "'.join(flatpak_command), shell_string))
+ _log.debug('Running in sandbox: "%s" %s\n' % ('" "'.join(flatpak_command), shell_string))
flatpak_command.extend(['sh', "/run/host/" + tmpscript.name])
try:
