mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 19:18:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Fix detection of overrides path in some cases

Browse source
This commit is contained in:
Thibault Saunier 2017-08-01 09:57:57 -04:00
parent 425990047b
commit a8aaada019
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gi/overrides/__init__.py
View file

@ -1,4 +1,3 @@
from pkgutil import extend_path from pkgutil import extend_path
__path__ = extend_path(__path__, __name__) __path__ = extend_path(__path__, __name__)
print(__path__, __name__)

13
scripts/pythondetector
View file

@ -58,9 +58,16 @@ if __name__ == "__main__":
# If we are installing in the same prefix as PyGobject # If we are installing in the same prefix as PyGobject
# make sure to install in the right place. # make sure to install in the right place.
import gi import gi.overrides
if os.path.commonprefix([gi._overridesdir, prefix]) == prefix:
print(gi._overridesdir) try:
gi.overrides.__path__.remove(os.path.abspath(os.path.join(
os.path.dirname(os.path.realpath(__file__)), '..', 'gi')))
except ValueError:
pass
overrides_path = gi.overrides.__path__[0]
if os.path.commonprefix([overrides_path, prefix]) == prefix:
print(overrides_path)
exit(0) exit(0)
# Otherwise follow python's way of install site packages inside # Otherwise follow python's way of install site packages inside