Bug 190241 – [WPE][GTK] run-minibrowser improperly creates webkit-flatpak environment

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

[Michael Catanzaro]

I'm using a jhbuild environment, NOT webkit-flatpak.

Every time I run run-minibrowser it prints this:

$ run-minibrowser --gtk

You need to install flatpak-builder >= 0.10.0 to be able to use the '/home/mcatanzaro/Projects/WebKit/Tools/Scripts/webkit-flatpak' script.

You can find some informations about how to install it for your distribution at:
    * http://flatpak.org/

And it creates GTK/ and UserFlatpak/ subdirectories under my build directory. If I delete them, they are created again the next time I run run-minibrowser.

[Thibault Saunier]

You somehow have a trailling flatpak env?

[Michael Catanzaro]

No, I delete it before running run-minibrowser. run-minibrowser is creating it.

[Michael Catanzaro]

Thibault, can you look into this please?

[Michael Catanzaro]

Problem is flatpakutils.py unconditionally creates the directories, but should do so only when called with --available.

[Michael Catanzaro]

Created attachment 356930 [details]
Patch

[Ross Kirsling]

Nice! I noticed this happening for WinCairo too but hadn't looked into why.

[WebKit Commit Bot]

Comment on attachment 356930 [details]
Patch

Clearing flags on attachment: 356930

Committed r239028: <https://trac.webkit.org/changeset/239028>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/46594304>

[Adrian Perez]

This broke all the Flatpak machinery, any tool that tries to use
the utility module will complain with:


Traceback (most recent call last):
  File "/home/aperez/devel/WebKit-ContentBlocking/Tools/Scripts/update-webkitwpe-flatpak", line 28, in <module>
    WebkitFlatpak.load_from_args(["--wpe", "--update"] + sys.argv[1:]).run()
  File "/home/aperez/devel/WebKit-ContentBlocking/Tools/flatpak/flatpakutils.py", line 761, in run
    if not self.clean_args():
  File "/home/aperez/devel/WebKit-ContentBlocking/Tools/flatpak/flatpakutils.py", line 574, in clean_args
    _log.debug("Using flatpak user dir: %s" % os.environ["FLATPAK_USER_DIR"])
  File "/home/aperez/.virtualenvs/webkit/lib/python2.7/UserDict.py", line 40, in __getitem__
    raise KeyError(key)
KeyError: 'FLATPAK_USER_DIR'

[Adrian Perez]

Created attachment 357010 [details]
Patch for landing

[Adrian Perez]

Created attachment 357011 [details]
Patch for landing

[Michael Catanzaro]

Comment on attachment 357011 [details]
Patch for landing

This will bring back the original bug. The flatpak directory will be created if flatpak is not in use, and even for ports that don't use flatpak. If it's not enough to move this up to the top of the function, then we'll need to find another way.

[Michael Catanzaro]

Yeah it looks like this is only used in clean_args, so I would just move it up to the top of clean_args.

[Michael Catanzaro]

Ping, isn't webkit-flatpak unusable until this lands?

[Michael Catanzaro]

I guess I'm going to close this, since the original issue is fixed.

I know this has broken the flatpak environment, but the fix is quite trivial, as explained in comment #14. Anyone who is actually using the flatpak environment should feel free to test and land that follow-up fix. In the meantime, it's clear nobody besides Adrian has attempted to use the flatpak environment since December 10, at least....