Title: [263083] trunk/Tools
Revision
263083
Author
[email protected]
Date
2020-06-16 01:56:44 -0700 (Tue, 16 Jun 2020)

Log Message

REGRESSION(r263029): [Flatpak SDK] Broke initial SDK installation

Patch by Philippe Normand <[email protected]> on 2020-06-16
Rubber-stamped by Žan Doberšek.

* flatpak/flatpakutils.py:
(FlatpakObject.version): Gracefully return an empty version when the flatpak info command
fails. This usually means the app has not been installed yet.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (263082 => 263083)


--- trunk/Tools/ChangeLog	2020-06-16 08:32:46 UTC (rev 263082)
+++ trunk/Tools/ChangeLog	2020-06-16 08:56:44 UTC (rev 263083)
@@ -1,3 +1,13 @@
+2020-06-16  Philippe Normand  <[email protected]>
+
+        REGRESSION(r263029): [Flatpak SDK] Broke initial SDK installation
+
+        Rubber-stamped by Žan Doberšek.
+
+        * flatpak/flatpakutils.py:
+        (FlatpakObject.version): Gracefully return an empty version when the flatpak info command
+        fails. This usually means the app has not been installed yet.
+
 2020-06-15  Megan Gardner  <[email protected]>
 
         Text form controls can scroll by 1px when value is the same length as size. No scrolling should happen.

Modified: trunk/Tools/flatpak/flatpakutils.py (263082 => 263083)


--- trunk/Tools/flatpak/flatpakutils.py	2020-06-16 08:32:46 UTC (rev 263082)
+++ trunk/Tools/flatpak/flatpakutils.py	2020-06-16 08:56:44 UTC (rev 263083)
@@ -197,7 +197,11 @@
         return run_sanitized(command, gather_output=gather_output)
 
     def version(self, ref_id):
-        output = self.flatpak("info", ref_id, gather_output=True)
+        try:
+            output = self.flatpak("info", ref_id, gather_output=True)
+        except subprocess.CalledProcessError:
+            # ref is likely not installed
+            return ""
         for line in output.splitlines():
             tokens = line.split(":")
             if len(tokens) != 2:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to