/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: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
498
498
    elif not getattr(exc_object, 'internal_error', True):
499
499
        report_user_error(exc_info, err_file)
500
500
        return errors.EXIT_ERROR
501
 
    elif isinstance(exc_object, (OSError, IOError)) or (
502
 
        # GZ 2010-05-20: Like (exc_type is pywintypes.error) but avoid import
503
 
        exc_type.__name__ == "error" and exc_type.__module__ == "pywintypes"):
 
501
    elif isinstance(exc_object, (OSError, IOError)):
504
502
        # Might be nice to catch all of these and show them as something more
505
503
        # specific, but there are too many cases at the moment.
506
504
        report_user_error(exc_info, err_file)