Title: [292494] trunk/Tools
- Revision
- 292494
- Author
- lmo...@igalia.com
- Date
- 2022-04-06 12:40:27 -0700 (Wed, 06 Apr 2022)
Log Message
[Flatpak SDK] Avoid termination if gdbus is not installed after 249303@main
https://bugs.webkit.org/show_bug.cgi?id=238878
Reviewed by Philippe Normand.
Instead of bailing out, just disable a11y bus forwarding. Also hide
some debug messages.
* flatpak/flatpakutils.py:
(WebkitFlatpak.setup_a11y_proxy):
* glib/dependencies/apt: Add libglib2.0-bin
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (292493 => 292494)
--- trunk/Tools/ChangeLog 2022-04-06 19:35:37 UTC (rev 292493)
+++ trunk/Tools/ChangeLog 2022-04-06 19:40:27 UTC (rev 292494)
@@ -1,3 +1,17 @@
+2022-04-06 Lauro Moura <lmo...@igalia.com>
+
+ [Flatpak SDK] Avoid termination if gdbus is not installed after 249303@main
+ https://bugs.webkit.org/show_bug.cgi?id=238878
+
+ Reviewed by Philippe Normand.
+
+ Instead of bailing out, just disable a11y bus forwarding. Also hide
+ some debug messages.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.setup_a11y_proxy):
+ * glib/dependencies/apt: Add libglib2.0-bin
+
2022-04-06 Jonathan Bedard <jbed...@apple.com>
[git-webkit] Provide https credentialing program
Modified: trunk/Tools/flatpak/flatpakutils.py (292493 => 292494)
--- trunk/Tools/flatpak/flatpakutils.py 2022-04-06 19:35:37 UTC (rev 292493)
+++ trunk/Tools/flatpak/flatpakutils.py 2022-04-06 19:40:27 UTC (rev 292494)
@@ -741,14 +741,14 @@
try:
output = subprocess.check_output(("gdbus", "call", "-e", "-d", "org.a11y.Bus", "-o", "/org/a11y/bus", "-m", "org.a11y.Bus.GetAddress"))
a11y_bus_address = re.findall(br"'([^']+)", output)[0] # Extract string from output from: ('unix:abstract=0000f',)
- Console.message("Found a11y address {}".format(a11y_bus_address))
- except (subprocess.CalledProcessError, IndexError) as e:
- Console.message("Failed to get a11y address {}".format(e))
+ _log.debug("Found a11y address {}".format(a11y_bus_address))
+ except (subprocess.CalledProcessError, IndexError, FileNotFoundError) as e:
+ _log.warning("Failed to get a11y address {}".format(e))
return []
dbus_proxy_path = shutil.which("xdg-dbus-proxy")
if not dbus_proxy_path:
- Console.message("Failed to find xdg-dbus-proxy")
+ _log.warning("Failed to find xdg-dbus-proxy. Can't forward a11y bus.")
return []
self.socket_dir = tempfile.TemporaryDirectory(prefix="webkit-flatpak-a11y-sockets-")
@@ -759,7 +759,7 @@
atexit.register(lambda: proxy_proc.terminate())
except (subprocess.CalledProcessError) as e:
- Console.message("Failed to get run xdg-dbus-proxy {}".format(e))
+ _log.warning("Failed to run xdg-dbus-proxy {}. Can't forward a11y bus.".format(e))
return []
return [
Modified: trunk/Tools/glib/dependencies/apt (292493 => 292494)
--- trunk/Tools/glib/dependencies/apt 2022-04-06 19:35:37 UTC (rev 292493)
+++ trunk/Tools/glib/dependencies/apt 2022-04-06 19:40:27 UTC (rev 292494)
@@ -64,6 +64,7 @@
# These are dependencies necessary for building with the Flatpak SDK.
flatpak
+ libglib2.0-bin
# These are dependencies necessary for building the jhbuild.
git
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
