~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-23 06:39:46 UTC
  • mfrom: (2034 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2035.
  • Revision ID: john@arbash-meinel.com-20060923063946-e596c8a8eef928b4
[merge] bzr.dev 2034

Show diffs side-by-side

added added

removed removed

Lines of Context:
611
611
        return run_bzr(argv)
612
612
        # do this here inside the exception wrappers to catch EPIPE
613
613
        sys.stdout.flush()
614
 
    except Exception, e:
 
614
    except (KeyboardInterrupt, Exception), e:
615
615
        # used to handle AssertionError and KeyboardInterrupt
616
616
        # specially here, but hopefully they're handled ok by the logger now
617
617
        bzrlib.trace.report_exception(sys.exc_info(), sys.stderr)