/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: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

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
87
88
        to_file.write("bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and\n")
88
89
        to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
89
90
        to_file.write("General Public License version 2 or later.\n")
 
91
        to_file.write("\nBazaar is part of the GNU Project to produce a free operating "
 
92
                "system.\n")
90
93
    to_file.write('\n')
91
94
 
92
95