[tor-commits] [tor-browser-bundle/maint-3.6] Bug 12381: Make PTs + proxy working on Windows.

[gk at torproject.org]

commit 34aedfbae28ed04ad7fe1df0695d246e8e14313a
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jul 18 21:28:25 2014 +0000

    Bug 12381: Make PTs + proxy working on Windows.
    
    py2exe does not cope with zipped .egg files and raises an import
    error if it encounters a respective module. We work around this bug
    by using not the 'install' but the 'install_lib' target when building
    and installing txsocksx.
---
 gitian/descriptors/windows/gitian-pluggable-transports.yml |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 6af344c..cc38427 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -210,7 +210,10 @@ script: |
   # dependency should be fine here as txsocksx catches the exception due to
   # missing __version__ and __sha__ .
   mkdir vcversioner-1.14.1.1-py2.7.egg
-  LD_PRELOAD= $INSTPYTHON setup.py install
+  # We need 'install_lib' here instead of 'install' as py2exe cannot handle
+  # zipped .egg files that are generated by the 'install' target. See bug
+  # 12381 for more details.
+  LD_PRELOAD= $INSTPYTHON setup.py install_lib
   cd ..
 
   # Building obfsproxy