From a8aaada019db5665bb17cfa3808cc2f74d72a342 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 1 Aug 2017 09:57:57 -0400 Subject: [PATCH] meson: Fix detection of overrides path in some cases --- gi/overrides/__init__.py | 1 - scripts/pythondetector | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gi/overrides/__init__.py b/gi/overrides/__init__.py index 57abf1a..b36383a 100644 --- a/gi/overrides/__init__.py +++ b/gi/overrides/__init__.py @@ -1,4 +1,3 @@ from pkgutil import extend_path __path__ = extend_path(__path__, __name__) -print(__path__, __name__) diff --git a/scripts/pythondetector b/scripts/pythondetector index e633734..eec43da 100644 --- a/scripts/pythondetector +++ b/scripts/pythondetector @@ -58,9 +58,16 @@ if __name__ == "__main__": # If we are installing in the same prefix as PyGobject # make sure to install in the right place. - import gi - if os.path.commonprefix([gi._overridesdir, prefix]) == prefix: - print(gi._overridesdir) + import gi.overrides + + 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) # Otherwise follow python's way of install site packages inside -- 2.7.4