/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 breezy/bzr/smart/request.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/smart/request.py
478
478
    elif isinstance(err, MemoryError):
479
479
        # GZ 2011-02-24: Copy breezy.trace -Dmem_dump functionality here?
480
480
        return (b'MemoryError',)
 
481
    elif isinstance(err, errors.AlreadyControlDirError):
 
482
        return (b'AlreadyControlDir', err.path)
481
483
    # Unserialisable error.  Log it, and return a generic error
482
484
    trace.log_exception_quietly()
483
485
    return (b'error',