Changeset 260859 in webkit

Timestamp:

Apr 28, 2020 5:26:31 PM (4 years ago)

Author:

Lauro Moura

Message:

[GTK] update-webkitgtk-libs: TypeError: cannot use a string pattern on a bytes-like object
​https://bugs.webkit.org/show_bug.cgi?id=211144

Reviewed by Michael Catanzaro.

Unconditionally decode the output from the 'id' command to make it
work with python3.

Also check if the doc directory exists before passing it to bwrap.
Should avoid errors like these:

bwrap: Can't find source path /run/user/1000/doc: No such file or directory

• flatpak/flatpakutils.py:

(WebkitFlatpak.run_in_sandbox):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-28  Lauro Moura  <lmoura@igalia.com>
+
+        [GTK] update-webkitgtk-libs: TypeError: cannot use a string pattern on a bytes-like object
+        https://bugs.webkit.org/show_bug.cgi?id=211144
+
+        Reviewed by Michael Catanzaro.
+
+        Unconditionally decode the output from the 'id' command to make it
+        work with python3.
+
+        Also check if the doc directory exists before passing it to bwrap.
+        Should avoid errors like these:
+
+        bwrap: Can't find source path /run/user/1000/doc: No such file or directory
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.run_in_sandbox):
+
 2020-04-28  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -662 +662 @@
             try:
                 with open(os.devnull, 'w') as devnull:
-                    uid = subprocess.check_output(("id", "-u"), stderr=devnull).strip()
-                    flatpak_command.append("--bind-mount=/run/user/{uid}/doc=/run/user/{uid}/doc".format(uid=uid))
+                    uid = subprocess.check_output(("id", "-u"), stderr=devnull).strip().decode()
+                    uid_doc_path = '/run/user/{uid}/doc'.format(uid=uid)
+                    if os.path.exists(uid_doc_path):
+                        flatpak_command.append("--bind-mount={uid_doc_path}={uid_doc_path}".format(uid_doc_path=uid_doc_path))
+                    else:
+                        _log.debug("Can't find user document path at '{uid_doc_path}'. Not mounting it.".format(uid_doc_path=uid_doc_path))
             except subprocess.CalledProcessError:
                 pass