← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Aaron Bentley
  • Date: 2005-10-08 04:01:04 UTC
  • mfrom: (1423)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1425.
  • Revision ID: aaron.bentley@utoronto.ca-20051008040104-1c604843ae42de07
Merge from Robert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
625
625
def run_bzr_catch_errors(argv):
626
626
    try:
627
627
        try:
628
 
            try:
629
 
                return run_bzr(argv)
630
 
            finally:
631
 
                # do this here inside the exception wrappers to catch EPIPE
632
 
                sys.stdout.flush()
633
 
        #wrap common errors as CommandErrors.
634
 
        except (NotBranchError,), e:
635
 
            raise BzrCommandError(str(e))
 
628
            return run_bzr(argv)
 
629
        finally:
 
630
            # do this here inside the exception wrappers to catch EPIPE
 
631
            sys.stdout.flush()
636
632
    except BzrCommandError, e:
637
633
        # command line syntax error, etc
638
634
        log_error(str(e))
654
650
            bzrlib.trace.note('broken pipe')
655
651
            return 2
656
652
        else:
 
653
            ## import pdb
 
654
            ## pdb.pm()
657
655
            bzrlib.trace.log_exception()
658
656
            return 2
659
657