[WPE]: Fix exception handling when flatpak is not installed
authorclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jun 2018 18:12:50 +0000 (18:12 +0000)
committerclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 29 Jun 2018 18:12:50 +0000 (18:12 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233364 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/flatpak/flatpakutils.py

index 4e02ddb..0bbfd3a 100644 (file)
@@ -1,3 +1,15 @@
+2018-06-29  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [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  <ross.kirsling@sony.com>
 
         [JSCOnly] Restore Windows build.
index 55873bf..a54d446 100644 (file)
@@ -83,7 +83,7 @@ def check_flatpak():
     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"