Changeset 271199 in webkit

Timestamp:

Jan 6, 2021, 5:45:07 AM (6 years ago)

Author:

Lauro Moura

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/linux_get_crash_log.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-06  Lauro Moura  <lmoura@igalia.com>
+
+        [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  <akeerthi@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py

@@ -109 +109 @@
             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)