Changeset 243387 in webkit

Timestamp:

Mar 22, 2019, 10:40:14 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[Flatpak] Manifest expanding fails for qt WPE extension
​https://bugs.webkit.org/show_bug.cgi?id=196148

Patch by Philippe Normand <​pnormand@igalia.com> on 2019-03-22
Reviewed by Alex Christensen.

• flatpak/flatpakutils.py:

(expand_submodules_recurse): The last recurse manifest expand
iteration might lead to a single module so take it into account
and don't try to recurse further.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-22  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak] Manifest expanding fails for qt WPE extension
+        https://bugs.webkit.org/show_bug.cgi?id=196148
+
+        Reviewed by Alex Christensen.
+
+        * flatpak/flatpakutils.py:
+        (expand_submodules_recurse): The last recurse manifest expand
+        iteration might lead to a single module so take it into account
+        and don't try to recurse further.
+
 2019-03-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -171 +171 @@
         submanifest = load_manifest(submanifest_path, port_name=port_name, command=command)
         all_modules.extend(expand_submodules_recurse(submanifest, submanifest_path, port_name, command))
+        return all_modules
+
+    # The last recurse manifest expand iteration might lead to a single module.
+    if not isinstance(modules, list):
+        all_modules.append(modules)
         return all_modules