Attachment 356930 Details for Bug 190241 – Patch

[patch] Patch

bug-190241-20181209170938.patch (text/plain), 2.59 KB, created by Michael Catanzaro on 2018-12-09 15:09:39 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-12-09 15:09:39 PST

Size: 2.59 KB

patch

obsolete

>Subversion Revision: 239022
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index ecdd761f1a8de4677c633ca82e1a8d4957d0eb29..87c61fdd7b5a150df7b0def919ac169c5f4340b0 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-09  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK] run-minibrowser improperly creates webkit-flatpak environment
>+        https://bugs.webkit.org/show_bug.cgi?id=190241
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        run-minibrowser calls into webkit-flatpak to check if a flatpak environment is available.
>+        Currently this actually creates the directories needed for the flatpak environment. Fix it.
>+
>+        * flatpak/flatpakutils.py:
>+        (WebkitFlatpak.clean_args):
>+        (WebkitFlatpak.run):
>+
> 2018-12-08  Daniel Bates  <dabates@apple.com>
> 
>         Fix lldb_webkit.py following r238771
>diff --git a/Tools/flatpak/flatpakutils.py b/Tools/flatpak/flatpakutils.py
>index 6a8ed54e0d149427962b8088e09f97941135b4d2..715a37a03f26b244f8170c4d437b939559aedbf5 100644
>--- a/Tools/flatpak/flatpakutils.py
>+++ b/Tools/flatpak/flatpakutils.py
>@@ -55,12 +55,6 @@ FLATPAK_REQ = [
> scriptdir = os.path.abspath(os.path.dirname(__file__))
> _log = logging.getLogger(__name__)
> 
>-os.environ["FLATPAK_USER_DIR"] = os.environ.get("WEBKIT_FLATPAK_USER_DIR", os.path.realpath(os.path.join(scriptdir, "../../WebKitBuild", "UserFlatpak")))
>-try:
>-    os.makedirs(os.environ["FLATPAK_USER_DIR"])
>-except OSError as e:
>-    pass
>-
> 
> class Colors:
>     HEADER = "\033[95m"
>@@ -599,6 +593,12 @@ class WebkitFlatpak:
>         self.manifest_path = os.path.abspath(os.path.join(scriptdir, '../flatpak/org.webkit.WebKit.yaml'))
>         self.build_name = self.name + "-generated"
> 
>+        os.environ["FLATPAK_USER_DIR"] = os.environ.get("WEBKIT_FLATPAK_USER_DIR", os.path.realpath(os.path.join(scriptdir, "../../WebKitBuild", "UserFlatpak")))
>+        try:
>+            os.makedirs(os.environ["FLATPAK_USER_DIR"])
>+        except OSError as e:
>+            pass
>+
>         build_root = os.path.join(self.source_root, 'WebKitBuild')
>         self.flatpak_build_path = os.path.join(build_root, self.platform, "FlatpakTree" + self.build_type)
>         self.cache_path = os.path.join(build_root, "FlatpakCache")
>@@ -755,12 +755,12 @@ class WebkitFlatpak:
>         return 0
> 
>     def run(self):
>-        if not self.clean_args():
>-            return 1
>-
>         if self.check_available:
>             return 0
> 
>+        if not self.clean_args():
>+            return 1
>+
>         if self.clean:
>             if os.path.exists(self.flatpak_build_path):
>                 shutil.rmtree(self.flatpak_build_path)

Actions: View | Formatted Diff | Diff

Attachments on bug 190241: 356930 | 357010 | 357011