Title: [268827] trunk/Tools
- Revision
- 268827
- Author
- clo...@igalia.com
- Date
- 2020-10-21 14:37:25 -0700 (Wed, 21 Oct 2020)
Log Message
update-webkitgtk-libs and run-webkit-tests fail silently if flatpak has problems updating
https://bugs.webkit.org/show_bug.cgi?id=218047
Reviewed by Philippe Normand.
This scripts were returning zero status when flatpak failed to
update in some cases. Fix them to return a non-zero status.
* Scripts/update-webkit-flatpak: Add missing sys.exit call with the return code.
* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox): In python false is zero when casted to int.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (268826 => 268827)
--- trunk/Tools/ChangeLog 2020-10-21 21:33:05 UTC (rev 268826)
+++ trunk/Tools/ChangeLog 2020-10-21 21:37:25 UTC (rev 268827)
@@ -1,3 +1,17 @@
+2020-10-21 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ update-webkitgtk-libs and run-webkit-tests fail silently if flatpak has problems updating
+ https://bugs.webkit.org/show_bug.cgi?id=218047
+
+ Reviewed by Philippe Normand.
+
+ This scripts were returning zero status when flatpak failed to
+ update in some cases. Fix them to return a non-zero status.
+
+ * Scripts/update-webkit-flatpak: Add missing sys.exit call with the return code.
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox): In python false is zero when casted to int.
+
2020-10-21 Lauro Moura <lmo...@igalia.com>
webkitpy: Check for duplicated keys in json expectation files
Modified: trunk/Tools/Scripts/update-webkit-flatpak (268826 => 268827)
--- trunk/Tools/Scripts/update-webkit-flatpak 2020-10-21 21:33:05 UTC (rev 268826)
+++ trunk/Tools/Scripts/update-webkit-flatpak 2020-10-21 21:37:25 UTC (rev 268827)
@@ -25,4 +25,4 @@
from flatpakutils import WebkitFlatpak
if __name__ == "__main__":
- WebkitFlatpak.load_from_args(["--update"] + sys.argv[1:]).run()
+ sys.exit(WebkitFlatpak.load_from_args(["--update"] + sys.argv[1:]).run())
Modified: trunk/Tools/flatpak/flatpakutils.py (268826 => 268827)
--- trunk/Tools/flatpak/flatpakutils.py 2020-10-21 21:33:05 UTC (rev 268826)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-10-21 21:37:25 UTC (rev 268827)
@@ -659,7 +659,7 @@
def run_in_sandbox(self, *args, **kwargs):
if not self.setup_builddir():
- return False
+ return 1
cwd = kwargs.get("cwd", None)
extra_env_vars = kwargs.get("env", {})
stdout = kwargs.get("stdout", sys.stdout)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
