Title: [258641] trunk/Tools
- Revision
- 258641
- Author
- [email protected]
- Date
- 2020-03-18 09:18:57 -0700 (Wed, 18 Mar 2020)
Log Message
[JHBuild] Flatpak used for run-minibrowser even when forcing jhbuild
https://bugs.webkit.org/show_bug.cgi?id=209222
Reviewed by Carlos Alberto Lopez Perez.
* Scripts/webkitdirs.pm:
(runInFlatpakIfAvailable): If a command wrapper is required it
means Flatpak shouldn't be used.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (258640 => 258641)
--- trunk/Tools/ChangeLog 2020-03-18 16:07:25 UTC (rev 258640)
+++ trunk/Tools/ChangeLog 2020-03-18 16:18:57 UTC (rev 258641)
@@ -1,3 +1,14 @@
+2020-03-18 Philippe Normand <[email protected]>
+
+ [JHBuild] Flatpak used for run-minibrowser even when forcing jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=209222
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * Scripts/webkitdirs.pm:
+ (runInFlatpakIfAvailable): If a command wrapper is required it
+ means Flatpak shouldn't be used.
+
2020-03-18 Aakash Jain <[email protected]>
[ews] commit-queue should comment on bug in case patch fails to build
Modified: trunk/Tools/Scripts/webkitdirs.pm (258640 => 258641)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-03-18 16:07:25 UTC (rev 258640)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-03-18 16:18:57 UTC (rev 258641)
@@ -2102,6 +2102,11 @@
sub runInFlatpakIfAvailable(@)
{
+ my $prefix = wrapperPrefixIfNeeded();
+ if (defined($prefix)) {
+ return 0;
+ }
+
if (inFlatpakSandbox()) {
return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
