Rev 4836: (mbp, for doxxx) show python executable correctly in --version in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4836 [merge]
revision-id: pqm at pqm.ubuntu.com-20091130061212-qky611tap8132jyk
parent: pqm at pqm.ubuntu.com-20091130044931-b5rjfh24zq1d3lju
parent: gordon at doxxx.net-20091130044136-0307s83ji329010z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-11-30 06:12:12 +0000
message:
  (mbp, for doxxx) show python executable correctly in --version
modified:
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
=== modified file 'bzrlib/version.py'
--- a/bzrlib/version.py	2009-11-15 21:37:51 +0000
+++ b/bzrlib/version.py	2009-11-30 04:41:36 +0000
@@ -50,8 +50,9 @@
     # show path to python interpreter
     # (bzr.exe use python interpreter from pythonXY.dll
     # but sys.executable point to bzr.exe itself)
-    if getattr(sys, 'frozen', None) is not None:  # check for bzr.exe
-        # python executable
+    # however, sys.frozen exists if running from bzr.exe
+    # see http://www.py2exe.org/index.cgi/Py2exeEnvironment
+    if getattr(sys, 'frozen', None) is None: # if not bzr.exe
         to_file.write(sys.executable + ' ')
     else:
         # pythonXY.dll