Mercurial > sat_docs
changeset 142:2602c690806b
flatpak (sat_wrapper): don't use packages from $HOME in PYTHONPATH to avoid conflicts:
before this change, packages from ~/.local/lib/python2.7/site-packages when included, and
this could conflict with the ones from Flatpak, resulting in unwanted side effects (e.g.
OMEMO not available).
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sun, 23 Jun 2019 19:45:37 +0200 |
| parents | 15d1ddcd78cf |
| children | dd83138a9b1d |
| files | flatpak/sat_wrapper.py |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flatpak/sat_wrapper.py Sun Jun 23 18:14:15 2019 +0200 +++ b/flatpak/sat_wrapper.py Sun Jun 23 19:45:37 2019 +0200 @@ -11,6 +11,12 @@ const_INT_PREFIX = "org.salutatoi.SAT" const_OBJ_PATH = '/org/salutatoi/SAT/bridge' +# we remove any path with "/home" from PYTHONPATH because we have +# "--filesystem=home" permission and packages in .local/lib/python2.7/site-packages may +# conflict with the ones from flatpak +clean_pythonpath = ':'.join(p for p in sys.path if p and not p.startswith('/home')) +os.environ['PYTHONPATH'] = clean_pythonpath +os.environ['PYTHONNOUSERSITE'] = '1' try: sessions_bus = dbus.SessionBus()