Rev 5637: (spiv) bzr.exe: add "site-packages" directory to sys.path to allow in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5637 [merge]
revision-id: pqm at pqm.ubuntu.com-20110408080330-q7hax4s1ftkp5p46
parent: pqm at pqm.ubuntu.com-20110401042049-br5zw2egh3j0ryc2
parent: bialix at ukr.net-20110328084332-5kxilowv9m85zh50
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Fri 2011-04-08 08:03:30 +0000
message:
  (spiv) bzr.exe: add "site-packages" directory to sys.path to allow
   "installing" third-party libs required by some plugins (Alexander Belchenko)
modified:
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
  tools/win32/py2exe_boot_common.py boot_common.py-20100726104937-42rsvhmwpm52nrv5-1
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-04-01 03:11:57 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-04-08 08:03:30 +0000
@@ -62,6 +62,11 @@
   had changed.  Bazaar was attempting to open and lock the master branch
   twice in this case.  (Andrew Bennetts, #733350)
 
+* 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-28 08:43:32 +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