Rev 2495: (bialix, r=john) don't bundle into standalone bzr.exe site.py (with in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2495
revision-id: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: pqm at pqm.ubuntu.com-20070525043332-aw7j04dvjy6ua1v9
parent: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-25 06:00:23 +0100
message:
  (bialix,r=john) don't bundle into standalone bzr.exe site.py (with
   their depends), and tools/doc_generate
modified:
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 2481.2.1
    merged: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
    parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: installer
    timestamp: Fri 2007-05-04 14:02:41 +0300
    message:
      don't bundle into standalone bzr.exe site.py (with their depends), and tools/doc_generate
=== modified file 'bzrlib/version.py'
--- a/bzrlib/version.py	2007-03-23 21:46:46 +0000
+++ b/bzrlib/version.py	2007-05-04 11:02:41 +0000
@@ -41,8 +41,7 @@
         print "    revid:", src_revision_id
         print "    branch nick:", src_tree.branch.nick
     print "Using python interpreter:", sys.executable
-    import site
-    print "Using python standard library:", os.path.dirname(site.__file__)
+    print "Using python standard library:", os.path.dirname(os.__file__)
     print "Using bzrlib:",
     if len(bzrlib.__path__) > 1:
         # print repr, which is a good enough way of making it clear it's

=== modified file 'setup.py'
--- a/setup.py	2007-03-11 23:34:27 +0000
+++ b/setup.py	2007-05-04 11:02:41 +0000
@@ -223,7 +223,7 @@
 
     options_list = {"py2exe": {"packages": BZRLIB['packages'] +
                                            additional_packages,
-                               "excludes": ["Tkinter", "medusa"],
+                               "excludes": ["Tkinter", "medusa", "tools"],
                                "dist_dir": "win32_bzr.exe",
                               },
                    }