Title: [239073] trunk/Tools
- Revision
- 239073
- Author
- [email protected]
- Date
- 2018-12-11 07:14:51 -0800 (Tue, 11 Dec 2018)
Log Message
Unreviewed, WPE build fix after r239028
The FLATPAK_USER_DIR env var is not set early enough, leading to:
Traceback (most recent call last):
File "/home/phil/WebKit/Tools/Scripts/webkit-flatpak", line 28, in <module>
sys.exit(WebkitFlatpak.load_from_args().run())
File "/home/phil/WebKit/Tools/flatpak/flatpakutils.py", line 761, in run
if not self.clean_args():
File "/home/phil/WebKit/Tools/flatpak/flatpakutils.py", line 574, in clean_args
_log.debug("Using flatpak user dir: %s" % os.environ["FLATPAK_USER_DIR"])
File "/usr/lib/python2.7/UserDict.py", line 40, in __getitem__
raise KeyError(key)
KeyError: 'FLATPAK_USER_DIR'
* flatpak/flatpakutils.py:
(WebkitFlatpak.clean_args):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (239072 => 239073)
--- trunk/Tools/ChangeLog 2018-12-11 14:33:36 UTC (rev 239072)
+++ trunk/Tools/ChangeLog 2018-12-11 15:14:51 UTC (rev 239073)
@@ -1,3 +1,23 @@
+2018-12-11 Philippe Normand <[email protected]>
+
+ Unreviewed, WPE build fix after r239028
+
+ The FLATPAK_USER_DIR env var is not set early enough, leading to:
+
+ Traceback (most recent call last):
+ File "/home/phil/WebKit/Tools/Scripts/webkit-flatpak", line 28, in <module>
+ sys.exit(WebkitFlatpak.load_from_args().run())
+ File "/home/phil/WebKit/Tools/flatpak/flatpakutils.py", line 761, in run
+ if not self.clean_args():
+ File "/home/phil/WebKit/Tools/flatpak/flatpakutils.py", line 574, in clean_args
+ _log.debug("Using flatpak user dir: %s" % os.environ["FLATPAK_USER_DIR"])
+ File "/usr/lib/python2.7/UserDict.py", line 40, in __getitem__
+ raise KeyError(key)
+ KeyError: 'FLATPAK_USER_DIR'
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.clean_args):
+
2018-12-10 Don Olmstead <[email protected]>
Move ENABLE_RESOURCE_LOAD_STATISTICS to FeatureDefines.xcconfig
Modified: trunk/Tools/flatpak/flatpakutils.py (239072 => 239073)
--- trunk/Tools/flatpak/flatpakutils.py 2018-12-11 14:33:36 UTC (rev 239072)
+++ trunk/Tools/flatpak/flatpakutils.py 2018-12-11 15:14:51 UTC (rev 239073)
@@ -570,6 +570,12 @@
self.icc_version = None
def clean_args(self):
+ 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
+
configure_logging(logging.DEBUG if self.verbose else logging.INFO)
_log.debug("Using flatpak user dir: %s" % os.environ["FLATPAK_USER_DIR"])
@@ -593,12 +599,6 @@
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")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
