/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-07-20 02:17:05 UTC
  • mfrom: (7518.1.2 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200720021705-5f11tmo1hdqjxm6x
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/387628

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/smart/request.py
472
472
    elif isinstance(err, MemoryError):
473
473
        # GZ 2011-02-24: Copy breezy.trace -Dmem_dump functionality here?
474
474
        return (b'MemoryError',)
 
475
    elif isinstance(err, errors.AlreadyControlDirError):
 
476
        return (b'AlreadyControlDir', err.path)
475
477
    # Unserialisable error.  Log it, and return a generic error
476
478
    trace.log_exception_quietly()
477
479
    return (b'error',