/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Martin Pool
  • Date: 2009-12-09 05:47:32 UTC
  • mfrom: (4879 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4880.
  • Revision ID: mbp@sourcefrog.net-20091209054732-7414e9uma23mfv6x
trivial merge of trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
50
50
    # show path to python interpreter
51
51
    # (bzr.exe use python interpreter from pythonXY.dll
52
52
    # but sys.executable point to bzr.exe itself)
53
 
    if not hasattr(sys, 'frozen'):  # check for bzr.exe
54
 
        # python executable
 
53
    # however, sys.frozen exists if running from bzr.exe
 
54
    # see http://www.py2exe.org/index.cgi/Py2exeEnvironment
 
55
    if getattr(sys, 'frozen', None) is None: # if not bzr.exe
55
56
        to_file.write(sys.executable + ' ')
56
57
    else:
57
58
        # pythonXY.dll