/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: Vincent Ladeuil
  • Date: 2010-04-28 10:33:44 UTC
  • mfrom: (5171.2.3 401599-strict-warnings)
  • mto: This revision was merged to the branch mainline in revision 5191.
  • Revision ID: v.ladeuil+lp@free.fr-20100428103344-e32qf3cn1avdd2cb
Don't mention --no-strict when we just issue the warning about unclean trees

Show diffs side-by-side

added added

removed removed

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