Changeset 268827 in webkit

Timestamp:

Oct 21, 2020, 2:37:25 PM (6 years ago)

Author:

clopez@igalia.com

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/update-webkit-flatpak (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-21  Carlos Alberto Lopez Perez  <clopez@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  <lmoura@igalia.com>
 

trunk/Tools/Scripts/update-webkit-flatpak

@@ -26 +26 @@
 
 if __name__ == "__main__":
-    WebkitFlatpak.load_from_args(["--update"] + sys.argv[1:]).run()
+    sys.exit(WebkitFlatpak.load_from_args(["--update"] + sys.argv[1:]).run())

trunk/Tools/flatpak/flatpakutils.py

@@ -660 +660 @@
     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", {})