Rev 5760: (mbp, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5760 [merge]
revision-id: pqm at pqm.ubuntu.com-20110406023617-nwz8liiss94qiejb
parent: pqm at pqm.ubuntu.com-20110405160457-sat8n5qv2lmscjoo
parent: mbp at sourcefrog.net-20110406013740-tnne9j9e23iqywgs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-04-06 02:36:17 +0000
message:
  (mbp,
   for bialix) bzr.exe: add "site-packages" directory to sys.path to
   allow "installing" third-party libs required by some plugins
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  tools/win32/py2exe_boot_common.py boot_common.py-20100726104937-42rsvhmwpm52nrv5-1
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-04-05 15:02:00 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-04-06 01:37:40 +0000
@@ -44,6 +44,11 @@
 
  * Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
 
+* Standalone bzr.exe installation on Windows: user can put additional python 
+  libraries into ``site-packages`` subdirectory of the installation directory,
+  this might be required for "installing" extra dependencies for some plugins.
+  (Alexander Belchenko, #743256)
+
 Documentation
 *************
 

=== modified file 'tools/win32/py2exe_boot_common.py'
--- a/tools/win32/py2exe_boot_common.py	2010-08-02 16:12:01 +0000
+++ b/tools/win32/py2exe_boot_common.py	2011-03-27 10:09:00 +0000
@@ -8,7 +8,6 @@
 
 import sys
 if sys.frozen == "windows_exe":
-
     class Blackhole(object):
         softspace = 0
         def write(self, text):
@@ -18,6 +17,12 @@
     sys.stdout = Blackhole()
     sys.stderr = Blackhole()
     del Blackhole
+
+# add more directories to sys.path to allow "installing" third-party libs
+# required by some plugins (see bug #743256)
+import os
+sys.path.append(os.path.join(os.path.dirname(sys.executable), 'site-packages'))
+del os
 del sys
 
 # Disable linecache.getline() which is called by