Modified: trunk/Tools/ChangeLog (260362 => 260363)
--- trunk/Tools/ChangeLog 2020-04-20 12:10:03 UTC (rev 260362)
+++ trunk/Tools/ChangeLog 2020-04-20 12:29:23 UTC (rev 260363)
@@ -1,3 +1,14 @@
+2020-04-20 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Drive-by fixes
+ https://bugs.webkit.org/show_bug.cgi?id=210557
+
+ Reviewed by Žan Doberšek.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox): Properly format error message.
+ (WebkitFlatpak.main): Show flatpak update output.
+
2020-04-20 Sergio Villar Senin <[email protected]>
[WebXR][WPE] Let XR_RUNTIME_JSON environment variable go through for testing
Modified: trunk/Tools/flatpak/flatpakutils.py (260362 => 260363)
--- trunk/Tools/flatpak/flatpakutils.py 2020-04-20 12:10:03 UTC (rev 260362)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-04-20 12:29:23 UTC (rev 260363)
@@ -531,7 +531,7 @@
gst_dir = os.environ.get('GST_BUILD_PATH')
if not gst_dir:
if building:
- Console.warning_message("$GST_BUILD_PATH environment variable not set. Skipping gst-build\n")
+ _log.debug("$GST_BUILD_PATH environment variable not set. Skipping gst-build\n")
return []
if not os.path.exists(os.path.join(gst_dir, 'gst-env.py')):
@@ -562,7 +562,8 @@
for option_name in ("branch.%s.webKitBranchBuild" % git_branch_name,
"webKitBranchBuild"):
try:
- output = subprocess.check_output(("git", "config", "--bool", option_name)).strip()
+ with open(os.devnull, 'w') as devnull:
+ output = subprocess.check_output(("git", "config", "--bool", option_name), stderr=devnull).strip()
except subprocess.CalledProcessError:
continue
@@ -720,7 +721,7 @@
toolchain_name = os.environ.get("CC", "gcc")
toolchain_path = self.icc_version[toolchain_name]
if not os.path.isfile(toolchain_path):
- Console.error_message("%s is not a valid IceCC toolchain. Please run webkit-flatpak -r")
+ Console.error_message("%s is not a valid IceCC toolchain. Please run webkit-flatpak -r", toolchain_path)
return 1
forwarded.update({
"CCACHE_PREFIX": "icecc",
@@ -752,9 +753,8 @@
return 1
if self.update:
- Console.message("Updating Flatpak %s environment" % self.build_type)
repo = self.sdk_repo
- repo.flatpak("update")
+ repo.flatpak("update", show_output=True, comment="Updating Flatpak %s environment" % self.build_type)
for package in self._get_packages():
if package.name.startswith("org.webkit") and repo.is_app_installed(package.name) \
and not repo.is_app_installed(package.name, branch=self.sdk_branch):
@@ -822,10 +822,8 @@
return self.run_gdb()
elif self.user_command:
program = self.user_command[0]
- if program.endswith("build-webkit"):
- Console.message("Building webkit")
- if self.cmakeargs:
- self.user_command.append("--cmakeargs=%s" % self.cmakeargs)
+ if program.endswith("build-webkit") and self.cmakeargs:
+ self.user_command.append("--cmakeargs=%s" % self.cmakeargs)
return self.run_in_sandbox(*self.user_command)
elif not self.update and not self.build_gst:
