Title: [271199] trunk/Tools
- Revision
- 271199
- Author
- [email protected]
- Date
- 2021-01-06 05:45:07 -0800 (Wed, 06 Jan 2021)
Log Message
[Flatpak SDK] coredumpctl invocation when using a local SDK repo fallbacks to the remote repo
https://bugs.webkit.org/show_bug.cgi?id=219934
Reviewed by Philippe Normand.
Some commands run in flatpak may end up calling other commands on the
host through flatpak-spawn that would enter the flatpak environment
again. One such command happens when getting crash logs, which invokes
webkit-flatpak with --gdb-stack-trace.
Before this commit, the WEBKIT_FLATPAK_USER_DIR is not forwarded,
making flatpakutils.py to download the regular UserFlatpak SDK instead
of using the one in the mentioned variable.
* Scripts/webkitpy/port/linux_get_crash_log.py:
(GDBCrashLogGenerator._get_trace_from_flatpak):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (271198 => 271199)
--- trunk/Tools/ChangeLog 2021-01-06 10:37:42 UTC (rev 271198)
+++ trunk/Tools/ChangeLog 2021-01-06 13:45:07 UTC (rev 271199)
@@ -1,3 +1,22 @@
+2021-01-06 Lauro Moura <[email protected]>
+
+ [Flatpak SDK] coredumpctl invocation when using a local SDK repo fallbacks to the remote repo
+ https://bugs.webkit.org/show_bug.cgi?id=219934
+
+ Reviewed by Philippe Normand.
+
+ Some commands run in flatpak may end up calling other commands on the
+ host through flatpak-spawn that would enter the flatpak environment
+ again. One such command happens when getting crash logs, which invokes
+ webkit-flatpak with --gdb-stack-trace.
+
+ Before this commit, the WEBKIT_FLATPAK_USER_DIR is not forwarded,
+ making flatpakutils.py to download the regular UserFlatpak SDK instead
+ of using the one in the mentioned variable.
+
+ * Scripts/webkitpy/port/linux_get_crash_log.py:
+ (GDBCrashLogGenerator._get_trace_from_flatpak):
+
2021-01-05 Aditya Keerthi <[email protected]>
REGRESSION (r261157): Crash in WKSelectPopover when running as iPhone app on iPad
Modified: trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py (271198 => 271199)
--- trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py 2021-01-06 10:37:42 UTC (rev 271198)
+++ trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py 2021-01-06 13:45:07 UTC (rev 271199)
@@ -108,9 +108,17 @@
else:
coredump_since = "--gdb-stack-trace"
webkit_flatpak_path = self._webkit_finder.path_to_script('webkit-flatpak')
- cmd = ['flatpak-spawn', '--host', webkit_flatpak_path, '--%s' % self._port_name,
- "--%s" % self._configuration.lower(), coredump_since]
+ cmd = ['flatpak-spawn', '--host']
+ # Forward WEBKIT_FLATPAK_USER_DIR so webkit-flatpak can use the same flatpak
+ # install as the current one.
+ user_dir = os.environ.get('WEBKIT_FLATPAK_USER_DIR')
+ if user_dir:
+ cmd.append("--env=WEBKIT_FLATPAK_USER_DIR=%s" % user_dir)
+
+ cmd.extend([webkit_flatpak_path, '--%s' % self._port_name,
+ "--%s" % self._configuration.lower(), "--verbose", coredump_since])
+
proc = self._executive.popen(cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
crash_log, stderr = proc.communicate()
errors = string_utils.decode(str(stderr or '<empty>'), errors='ignore').splitlines()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
