Title: [239028] trunk/Tools
- Revision
- 239028
- Author
- [email protected]
- Date
- 2018-12-10 06:58:31 -0800 (Mon, 10 Dec 2018)
Log Message
[WPE][GTK] run-minibrowser improperly creates webkit-flatpak environment
https://bugs.webkit.org/show_bug.cgi?id=190241
Reviewed by Carlos Garcia Campos.
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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (239027 => 239028)
--- trunk/Tools/ChangeLog 2018-12-10 14:56:16 UTC (rev 239027)
+++ trunk/Tools/ChangeLog 2018-12-10 14:58:31 UTC (rev 239028)
@@ -1,5 +1,19 @@
2018-12-10 Michael Catanzaro <[email protected]>
+ [WPE][GTK] run-minibrowser improperly creates webkit-flatpak environment
+ https://bugs.webkit.org/show_bug.cgi?id=190241
+
+ Reviewed by Carlos Garcia Campos.
+
+ 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-10 Michael Catanzaro <[email protected]>
+
[GTK] Don't use the slice allocator
https://bugs.webkit.org/show_bug.cgi?id=192360
Modified: trunk/Tools/flatpak/flatpakutils.py (239027 => 239028)
--- trunk/Tools/flatpak/flatpakutils.py 2018-12-10 14:56:16 UTC (rev 239027)
+++ trunk/Tools/flatpak/flatpakutils.py 2018-12-10 14:58:31 UTC (rev 239028)
@@ -55,13 +55,7 @@
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"
OKBLUE = "\033[94m"
@@ -599,6 +593,12 @@
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 @@
return 0
def run(self):
+ if self.check_available:
+ return 0
+
if not self.clean_args():
return 1
- if self.check_available:
- return 0
-
if self.clean:
if os.path.exists(self.flatpak_build_path):
shutil.rmtree(self.flatpak_build_path)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
