/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/commands.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-07 15:22:42 UTC
  • mfrom: (1843 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1846.
  • Revision ID: john@arbash-meinel.com-20060707152242-a7b5e0afd64d9d5a
[merge] bzr.dev 1843

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
596
596
        elif a == '--lsprof':
597
597
            opt_lsprof = True
598
598
        elif a == '--lsprof-file':
 
599
            opt_lsprof = True
599
600
            opt_lsprof_file = argv[i + 1]
600
601
            i += 1
601
602
        elif a == '--no-plugins':
669
670
            if not hasattr(e, 'errno'):
670
671
                raise
671
672
            if e.errno != errno.EPIPE:
672
 
                raise
 
673
                # Win32 raises IOError with errno=0 on a broken pipe
 
674
                if sys.platform != 'win32' or e.errno != 0:
 
675
                    raise
673
676
            pass
674
677
        except KeyboardInterrupt:
675
678
            pass
688
691
 
689
692
def run_bzr_catch_errors(argv):
690
693
    try:
691
 
        try:
692
 
            return run_bzr(argv)
693
 
        finally:
694
 
            # do this here inside the exception wrappers to catch EPIPE
695
 
            sys.stdout.flush()
 
694
        return run_bzr(argv)
 
695
        # do this here inside the exception wrappers to catch EPIPE
 
696
        sys.stdout.flush()
696
697
    except Exception, e:
697
698
        # used to handle AssertionError and KeyboardInterrupt
698
699
        # specially here, but hopefully they're handled ok by the logger now