From: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Tue, 1 Aug 2017 13:57:57 +0000 (-0400)
Subject: meson: Fix detection of overrides path in some cases
X-Git-Tag: 1.19.3~485^2~91
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8aaada019db5665bb17cfa3808cc2f74d72a342;p=platform%2Fupstream%2Fgstreamer.git

meson: Fix detection of overrides path in some cases
---

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