← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Marius Kruger
  • Date: 2007-06-27 18:48:10 UTC
  • mfrom: (2557 +trunk)
  • mto: (2605.1.1 rm-renamed)
  • mto: This revision was merged to the branch mainline in revision 2609.
  • Revision ID: marius.kruger@enerweb.co.za-20070627184810-4jq1y5f20xafow9w
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
712
712
 
713
713
def run_bzr_catch_errors(argv):
714
714
    try:
715
 
        try:
716
 
            return run_bzr(argv)
717
 
        finally:
718
 
            # do this here inside the exception wrappers to catch EPIPE
719
 
            sys.stdout.flush()
 
715
        return run_bzr(argv)
720
716
    except (KeyboardInterrupt, Exception), e:
721
717
        # used to handle AssertionError and KeyboardInterrupt
722
718
        # specially here, but hopefully they're handled ok by the logger now