Title: [258695] trunk/Tools
- Revision
- 258695
- Author
- [email protected]
- Date
- 2020-03-19 07:03:50 -0700 (Thu, 19 Mar 2020)
Log Message
[GTK][WPE] REGRESSION(r258626): flatpak is used even when WEBKIT_JHBUILD is set
https://bugs.webkit.org/show_bug.cgi?id=209278
Reviewed by Philippe Normand.
This happens when using an external jhbuild, because shouldUseFlatpak() assumes that no command prefix always
means flatpak.
* Scripts/webkitdirs.pm:
(shouldUseFlatpak): Return early if WEBKIT_JHBUILD is set.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (258694 => 258695)
--- trunk/Tools/ChangeLog 2020-03-19 13:27:18 UTC (rev 258694)
+++ trunk/Tools/ChangeLog 2020-03-19 14:03:50 UTC (rev 258695)
@@ -1,3 +1,16 @@
+2020-03-19 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] REGRESSION(r258626): flatpak is used even when WEBKIT_JHBUILD is set
+ https://bugs.webkit.org/show_bug.cgi?id=209278
+
+ Reviewed by Philippe Normand.
+
+ This happens when using an external jhbuild, because shouldUseFlatpak() assumes that no command prefix always
+ means flatpak.
+
+ * Scripts/webkitdirs.pm:
+ (shouldUseFlatpak): Return early if WEBKIT_JHBUILD is set.
+
2020-03-19 Philippe Normand <[email protected]>
[CMake] cache not cleared when build-webkit options change
Modified: trunk/Tools/Scripts/webkitdirs.pm (258694 => 258695)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-03-19 13:27:18 UTC (rev 258694)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-03-19 14:03:50 UTC (rev 258695)
@@ -2173,6 +2173,10 @@
return 0;
}
+ if (defined $ENV{'WEBKIT_JHBUILD'} && $ENV{'WEBKIT_JHBUILD'}) {
+ return 0;
+ }
+
my @prefix = wrapperPrefixIfNeeded();
return ((! inFlatpakSandbox()) and (@prefix == 0) and -e getUserFlatpakPath());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
