Title: [116880] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 116880
- Author
- [email protected]
- Date
- 2012-05-13 06:42:08 -0700 (Sun, 13 May 2012)
Log Message
Merge 112309 - [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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116879 => 116880)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:41:54 UTC (rev 116879)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:42:08 UTC (rev 116880)
@@ -1,3 +1,19 @@
+2012-03-26 Raphael Kubo da Costa <[email protected]>
+
+ [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 Gustavo Noronha Silva <[email protected]>
[GTK] Build gnutls without p11-kit support
Modified: releases/WebKitGTK/webkit-1.8/Tools/efl/jhbuildrc (116879 => 116880)
--- releases/WebKitGTK/webkit-1.8/Tools/efl/jhbuildrc 2012-05-13 13:41:54 UTC (rev 116879)
+++ releases/WebKitGTK/webkit-1.8/Tools/efl/jhbuildrc 2012-05-13 13:42:08 UTC (rev 116880)
@@ -19,7 +19,7 @@
import sys
__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
build_policy = 'updated'
Modified: releases/WebKitGTK/webkit-1.8/Tools/gtk/jhbuildrc (116879 => 116880)
--- releases/WebKitGTK/webkit-1.8/Tools/gtk/jhbuildrc 2012-05-13 13:41:54 UTC (rev 116879)
+++ releases/WebKitGTK/webkit-1.8/Tools/gtk/jhbuildrc 2012-05-13 13:42:08 UTC (rev 116880)
@@ -18,7 +18,7 @@
import sys
__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
build_policy = 'updated'
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
