/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/trace.py

  • Committer: John Arbash Meinel
  • Date: 2010-03-25 17:09:53 UTC
  • mto: This revision was merged to the branch mainline in revision 5116.
  • Revision ID: john@arbash-meinel.com-20100325170953-s6qzmwap7mg0frcx
Workaround a strange bug about the file closing before it is read.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
111
111
 
112
112
 
113
113
def note(*args, **kwargs):
114
 
    """Output a note to the user.
115
 
 
116
 
    Takes the same parameters as logging.info.
117
 
    :return: None
118
 
    """
119
114
    # FIXME note always emits utf-8, regardless of the terminal encoding
120
115
    #
121
116
    # FIXME: clearing the ui and then going through the abstract logging
243
238
    This sets the global _bzr_log_filename.
244
239
    """
245
240
    global _bzr_log_filename
246
 
 
247
 
    def _open_or_create_log_file(filename):
248
 
        """Open existing log file, or create with ownership and permissions
249
 
 
250
 
        It inherits the ownership and permissions (masked by umask) from
251
 
        the containing directory to cope better with being run under sudo
252
 
        with $HOME still set to the user's homedir.
253
 
        """
254
 
        flags = os.O_WRONLY | os.O_APPEND | osutils.O_TEXT
255
 
        while True:
256
 
            try:
257
 
                fd = os.open(filename, flags)
258
 
                break
259
 
            except OSError, e:
260
 
                if e.errno != errno.ENOENT:
261
 
                    raise
262
 
            try:
263
 
                fd = os.open(filename, flags | os.O_CREAT | os.O_EXCL, 0666)
264
 
            except OSError, e:
265
 
                if e.errno != errno.EEXIST:
266
 
                    raise
267
 
            else:
268
 
                osutils.copy_ownership_from_path(filename)
269
 
                break
270
 
        return os.fdopen(fd, 'at', 0) # unbuffered
271
 
 
272
 
 
273
241
    _bzr_log_filename = _get_bzr_log_filename()
274
242
    _rollover_trace_maybe(_bzr_log_filename)
275
243
    try:
276
 
        bzr_log_file = _open_or_create_log_file(_bzr_log_filename)
 
244
        buffering = 0 # unbuffered
 
245
        bzr_log_file = osutils.open_with_ownership(_bzr_log_filename, 'at', buffering)
 
246
        # bzr_log_file.tell() on windows always return 0 until some writing done
277
247
        bzr_log_file.write('\n')
278
248
        if bzr_log_file.tell() <= 2:
279
249
            bzr_log_file.write("this is a debug log for diagnosing/reporting problems in bzr\n")
282
252
 
283
253
        return bzr_log_file
284
254
 
285
 
    except EnvironmentError, e:
 
255
    except IOError, e:
286
256
        # If we are failing to open the log, then most likely logging has not
287
257
        # been set up yet. So we just write to stderr rather than using
288
258
        # 'warning()'. If we using warning(), users get the unhelpful 'no