Bug 196148 – [Flatpak] Manifest expanding fails for qt WPE extension

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Philippe Normand]

$ Tools/Scripts/webkit-flatpak --platform wpe --wpe-extension=qt --update
Updating Flatpak environment for WPE (Release)
Installing for user: org.kde.Platform/x86_64/5.11 from flathub
[####################] 12 delta parts, 104 loose fetched; 298436 KiB transferred in 22 seconds
Installing for user: org.freedesktop.Platform.ffmpeg/x86_64/1.6 from flathub
[####################] 1 delta parts, 2 loose fetched; 2649 KiB transferred in 0 seconds
Installing for user: org.kde.KStyle.Adwaita/x86_64/5.11 from flathub
[####################] 1 delta parts, 2 loose fetched; 351 KiB transferred in 0 seconds
Installing for user: org.kde.Platform.Locale/x86_64/5.11 from flathub
[####################] 4 metadata, 1 content objects fetched; 14 KiB transferred in 0 seconds
Installing for user: org.kde.Sdk/x86_64/5.11 from flathub
[####################] 22 delta parts, 117 loose fetched; 274907 KiB transferred in 32 seconds
Installing for user: org.kde.Sdk.Locale/x86_64/5.11 from flathub
[####################] 3 metadata, 1 content objects fetched; 13 KiB transferred in 0 seconds
Installing for user: org.kde.Platform.Locale/x86_64/5.11 from flathub
[####################] 5 delta parts, 128 loose fetched; 100516 KiB transferred in 6 seconds
Building org.webkit.WPE and dependencies in /home/igalia/pnormand/WebKit/WebKitBuild/WPE/FlatpakTreeRelease
Traceback (most recent call last):
  File "Tools/Scripts/webkit-flatpak", line 28, in <module>
    sys.exit(WebkitFlatpak.load_from_args().run())
  File "./Tools/flatpak/flatpakutils.py", line 836, in run
    return self.setup_dev_env()
  File "./Tools/flatpak/flatpakutils.py", line 872, in setup_dev_env
    self.name, self.sandbox_source_root, self.command):
  File "./Tools/flatpak/flatpakutils.py", line 209, in expand_manifest                               
    modules = expand_submodules_recurse(modules, manifest_path, port_name, command)
  File "./Tools/flatpak/flatpakutils.py", line 178, in expand_submodules_recurse
    submanifest = load_manifest(submanifest_path, port_name=port_name, command=command)
  File "./Tools/flatpak/flatpakutils.py", line 152, in load_manifest
    with open(manifest_path, "r") as mr:                     
IOError: [Errno 2] No such file or directory: '/home/igalia/pnormand/WebKit/Tools/flatpak/buildsystem'

[Philippe Normand]

Created attachment 365727 [details]
Patch

[Thibault Saunier]

Comment on attachment 365727 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=365727&action=review

Looks good otherwise.

> Tools/flatpak/flatpakutils.py:176
> +    if type(modules) != list:

Should be `if not isinstance(modules, list)`

[Philippe Normand]

Created attachment 365728 [details]
Patch

[Thibault Saunier]

Comment on attachment 365728 [details]
Patch

Informal r+

[WebKit Commit Bot]

Comment on attachment 365728 [details]
Patch

Clearing flags on attachment: 365728

Committed r243387: <https://trac.webkit.org/changeset/243387>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/49159586>