Title: [290224] trunk/Tools
- Revision
- 290224
- Author
- [email protected]
- Date
- 2022-02-20 05:14:51 -0800 (Sun, 20 Feb 2022)
Log Message
REGRESSION(r289470): [Flatpak SDK] Broken local SDK handling
https://bugs.webkit.org/show_bug.cgi?id=236940
Patch by Philippe Normand <[email protected]> on 2022-02-20
Reviewed by Martin Robinson.
The .Local path was incorrectly generated to WebKitBuild/UserFlatpak/.Local.
* flatpak/flatpakutils.py:
(WebkitFlatpak.clean_args): Revert .Local SDK path handling to the version before r289470.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (290223 => 290224)
--- trunk/Tools/ChangeLog 2022-02-20 07:12:29 UTC (rev 290223)
+++ trunk/Tools/ChangeLog 2022-02-20 13:14:51 UTC (rev 290224)
@@ -1,3 +1,15 @@
+2022-02-20 Philippe Normand <[email protected]>
+
+ REGRESSION(r289470): [Flatpak SDK] Broken local SDK handling
+ https://bugs.webkit.org/show_bug.cgi?id=236940
+
+ Reviewed by Martin Robinson.
+
+ The .Local path was incorrectly generated to WebKitBuild/UserFlatpak/.Local.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.clean_args): Revert .Local SDK path handling to the version before r289470.
+
2022-02-19 Sihui Liu <[email protected]>
Set custom general storage directory for custom WebsiteDataStore in TestController
Modified: trunk/Tools/flatpak/flatpakutils.py (290223 => 290224)
--- trunk/Tools/flatpak/flatpakutils.py 2022-02-20 07:12:29 UTC (rev 290223)
+++ trunk/Tools/flatpak/flatpakutils.py 2022-02-20 13:14:51 UTC (rev 290224)
@@ -592,7 +592,7 @@
def clean_args(self):
if self.user_repo:
- os.environ["FLATPAK_USER_DIR"] = os.path.join(FLATPAK_USER_DIR_PATH, ".Local")
+ os.environ["FLATPAK_USER_DIR"] = FLATPAK_USER_DIR_PATH + ".Local"
else:
os.environ["FLATPAK_USER_DIR"] = os.environ.get("WEBKIT_FLATPAK_USER_DIR", FLATPAK_USER_DIR_PATH)
self.flatpak_build_path = os.environ["FLATPAK_USER_DIR"]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
