← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/trace.py

  • Committer: Andrew Bennetts
  • Date: 2009-09-09 06:06:44 UTC
  • mfrom: (4634.6.27 2.0)
  • mto: (4634.6.28 2.0)
  • mto: This revision was merged to the branch mainline in revision 4680.
  • Revision ID: andrew.bennetts@canonical.com-20090909060644-pcuzlf8zs9gsrnka
Merge lp:bzr/2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
432
432
    elif isinstance(exc_object, KeyboardInterrupt):
433
433
        err_file.write("bzr: interrupted\n")
434
434
        return errors.EXIT_ERROR
 
435
    elif isinstance(exc_object, MemoryError):
 
436
        err_file.write("bzr: out of memory\n")
 
437
        return errors.EXIT_ERROR
435
438
    elif isinstance(exc_object, ImportError) \
436
439
        and str(exc_object).startswith("No module named "):
437
440
        report_user_error(exc_info, err_file,