Title: [243387] trunk/Tools
- Revision
- 243387
- Author
- commit-qu...@webkit.org
- Date
- 2019-03-22 10:40:14 -0700 (Fri, 22 Mar 2019)
Log Message
[Flatpak] Manifest expanding fails for qt WPE extension
https://bugs.webkit.org/show_bug.cgi?id=196148
Patch by Philippe Normand <pnorm...@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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (243386 => 243387)
--- trunk/Tools/ChangeLog 2019-03-22 17:21:37 UTC (rev 243386)
+++ trunk/Tools/ChangeLog 2019-03-22 17:40:14 UTC (rev 243387)
@@ -1,3 +1,15 @@
+2019-03-22 Philippe Normand <pnorm...@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 <cdu...@apple.com>
[ iOS Simulator] REGRESSION (r241821) Layout Test platform/ipad/fast/viewport/viewport-unchanged-by-minimum-effective-width-if-not-ignore-meta-viewport.html is a flaky failure on bots
Modified: trunk/Tools/flatpak/flatpakutils.py (243386 => 243387)
--- trunk/Tools/flatpak/flatpakutils.py 2019-03-22 17:21:37 UTC (rev 243386)
+++ trunk/Tools/flatpak/flatpakutils.py 2019-03-22 17:40:14 UTC (rev 243387)
@@ -172,6 +172,11 @@
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
+
for module in modules:
if type(module) is str:
submanifest_path = os.path.join(os.path.dirname(manifest_path), module)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
