/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: John Arbash Meinel
  • Date: 2010-01-06 17:46:15 UTC
  • mto: (4634.119.1 2.0)
  • mto: This revision was merged to the branch mainline in revision 4951.
  • Revision ID: john@arbash-meinel.com-20100106174615-cq1nckxhbuyemgjx
https://launchpad.net/bugs/503886
Fix bug #503886, errors setting up logging go to stderr.

The basic issue is that we were using logging to describe failures
to set up logging. However, those fail with bad error messages
rather than giving us the output we want. This was especially bad
when the failure was occuring on the server. Since 'ssh' will pass
back the stderr stream without bzr handling it at all.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006, 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
    osutils,
28
28
    trace,
29
29
    )
 
30
from bzrlib.branch import Branch
30
31
 
31
32
 
32
33
def show_version(show_config=True, show_copyright=True, to_file=None):
49
50
    # show path to python interpreter
50
51
    # (bzr.exe use python interpreter from pythonXY.dll
51
52
    # but sys.executable point to bzr.exe itself)
52
 
    # however, sys.frozen exists if running from bzr.exe
53
 
    # see http://www.py2exe.org/index.cgi/Py2exeEnvironment
54
 
    if getattr(sys, 'frozen', None) is None: # if not bzr.exe
 
53
    if not hasattr(sys, 'frozen'):  # check for bzr.exe
 
54
        # python executable
55
55
        to_file.write(sys.executable + ' ')
56
56
    else:
57
57
        # pythonXY.dll
82
82
    if show_copyright:
83
83
        to_file.write('\n')
84
84
        to_file.write(bzrlib.__copyright__ + '\n')
85
 
        to_file.write("http://bazaar.canonical.com/\n")
 
85
        to_file.write("http://bazaar-vcs.org/\n")
86
86
        to_file.write('\n')
87
87
        to_file.write("bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and\n")
88
88
        to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
89
89
        to_file.write("General Public License version 2 or later.\n")
90
 
        to_file.write("\nBazaar is part of the GNU Project to produce a free operating "
91
 
                "system.\n")
92
90
    to_file.write('\n')
93
91
 
94
92