Changeset 112309 in webkit

Timestamp:

Mar 27, 2012 1:33:07 PM (12 years ago)

Author:

kubo@profusion.mobi

Message:

[jhbuild] Prepend jhbuildrc's directory to sys.path instead of appending.
​https://bugs.webkit.org/show_bug.cgi?id=82252

Reviewed by Gustavo Noronha Silva.

Appending the directory containing common.py may be problematic if
another path in sys.path also contains either a common.py or a
common/ module, so prepend to select our version instead. This is
the case with fail2ban, which has a common/ directory which may
end up being in Python's default path.

• efl/jhbuildrc:
• gtk/jhbuildrc:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• efl/jhbuildrc (modified) (1 diff)
• gtk/jhbuildrc (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-26  Raphael Kubo da Costa  <rakuco@FreeBSD.org>
+
+        [jhbuild] Prepend jhbuildrc's directory to sys.path instead of appending.
+        https://bugs.webkit.org/show_bug.cgi?id=82252
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Appending the directory containing common.py may be problematic if
+        another path in sys.path also contains either a common.py or a
+        common/ module, so prepend to select our version instead. This is
+        the case with fail2ban, which has a common/ directory which may
+        end up being in Python's default path.
+
+        * efl/jhbuildrc:
+        * gtk/jhbuildrc:
+
 2012-03-27  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/efl/jhbuildrc

@@ -21 +21 @@
 
 __efl_tools_directory = os.path.abspath(os.path.dirname(__file__))
-sys.path.append(__efl_tools_directory)
+sys.path = [__efl_tools_directory] + sys.path
 import common
 

trunk/Tools/gtk/jhbuildrc

@@ -20 +20 @@
 
 __gtk_tools_directory = os.path.abspath(os.path.dirname(__file__))
-sys.path.append(__gtk_tools_directory)
+sys.path = [__gtk_tools_directory] + sys.path
 import common