Rev 5132: (jameinel) When building the bzr executable, in file:///home/pqm/archives/thelove/bzr/2.2/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5132 [merge]
revision-id: pqm at pqm.ubuntu.com-20110525182215-rdt09veh6tfzmril
parent: pqm at pqm.ubuntu.com-20110521205014-3n765a7c4mjyhxnc
parent: john at arbash-meinel.com-20110525121219-xlim12m2ayqflpl2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Wed 2011-05-25 18:22:15 +0000
message:
  (jameinel) When building the bzr executable,
   include python-fastimport as a package that needs to be bundled. (John A
   Meinel)
modified:
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'setup.py'
--- a/setup.py	2010-12-02 09:23:10 +0000
+++ b/setup.py	2011-05-25 12:12:19 +0000
@@ -468,6 +468,12 @@
     packages.append('sqlite3')
 
 
+def get_fastimport_py2exe_info(includes, excludes, packages):
+    # This is the python-fastimport package, not to be confused with the
+    # bzr-fastimport plugin.
+    packages.append('fastimport')
+
+
 if 'bdist_wininst' in sys.argv:
     def find_docs():
         docs = []
@@ -660,6 +666,9 @@
     if 'svn' in plugins:
         get_svn_py2exe_info(includes, excludes, packages)
 
+    if 'fastimport' in plugins:
+        get_fastimport_py2exe_info(includes, excludes, packages)
+
     if "TBZR" in os.environ:
         # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
         # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and