Title: [233364] trunk/Tools
Revision
233364
Author
[email protected]
Date
2018-06-29 11:12:50 -0700 (Fri, 29 Jun 2018)

Log Message

[WPE]: Fix exception handling when flatpak is not installed
https://bugs.webkit.org/show_bug.cgi?id=186771

Unreviewed followup-fix after r233362

This was causing failures when flatpak is not installed.

* flatpak/flatpakutils.py:
(check_flatpak):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (233363 => 233364)


--- trunk/Tools/ChangeLog	2018-06-29 17:55:24 UTC (rev 233363)
+++ trunk/Tools/ChangeLog	2018-06-29 18:12:50 UTC (rev 233364)
@@ -1,3 +1,15 @@
+2018-06-29  Carlos Alberto Lopez Perez  <[email protected]>
+
+        [WPE]: Fix exception handling when flatpak is not installed
+        https://bugs.webkit.org/show_bug.cgi?id=186771
+
+        Unreviewed followup-fix after r233362
+
+        This was causing failures when flatpak is not installed.
+
+        * flatpak/flatpakutils.py:
+        (check_flatpak):
+
 2018-06-29  Ross Kirsling  <[email protected]>
 
         [JSCOnly] Restore Windows build.

Modified: trunk/Tools/flatpak/flatpakutils.py (233363 => 233364)


--- trunk/Tools/flatpak/flatpakutils.py	2018-06-29 17:55:24 UTC (rev 233363)
+++ trunk/Tools/flatpak/flatpakutils.py	2018-06-29 18:12:50 UTC (rev 233364)
@@ -83,7 +83,7 @@
     for app, required_version in FLATPAK_REQ:
         try:
             output = subprocess.check_output([app, "--version"])
-        except subprocess.CalledProcessError, OSError:
+        except (subprocess.CalledProcessError, OSError):
             Console.message("\n%sYou need to install %s >= %s"
                             " to be able to use the '%s' script.\n\n"
                             "You can find some informations about"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to