Attachment 357011 Details for Bug 190241 – Patch for landing

[patch] Patch for landing

bug-190241-20181211020501.patch (text/plain), 1.78 KB, created by Adrian Perez on 2018-12-10 16:05:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2018-12-10 16:05:02 PST

Size: 1.78 KB

patch

obsolete

>Subversion Revision: 239056
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7855b0d80a890a518053ef42eb8cb81da94f5242..5573b2d13bf631a4c25d2a35793b147aff3ca9b9 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-12-10  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        Unreviewed fix after r239028. [WPE][GTK] run-minibrowser improperly creates webkit-flatpak environment
>+        https://bugs.webkit.org/show_bug.cgi?id=190241
>+        <rdar://problem/46594304>
>+
>+        * flatpak/flatpakutils.py:
>+        (WebkitFlatpak.clean_args): Make sure that the FLATPAK_USER_DIR environment variable is always set.
>+
> 2018-12-10  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Unable to upload data that conforms to "public.item" but not "public.content"
>diff --git a/Tools/flatpak/flatpakutils.py b/Tools/flatpak/flatpakutils.py
>index 715a37a03f26b244f8170c4d437b939559aedbf5..b4d1a40a5acbd530478ff7b5b1d09c5d95b5c04a 100644
>--- a/Tools/flatpak/flatpakutils.py
>+++ b/Tools/flatpak/flatpakutils.py
>@@ -55,6 +55,8 @@ 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")))
>+
> 
> class Colors:
>     HEADER = "\033[95m"
>@@ -593,7 +595,6 @@ 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:

Flags:

mcatanzaro: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 190241: 356930 | 357010 | 357011