Merge lp:~gz/bzr/2.3_unprintable_retrywithnewpacks into lp:bzr/2.3
Proposed by
Martin Packman
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5664 |
Proposed branch: | lp:~gz/bzr/2.3_unprintable_retrywithnewpacks |
Merge into: | lp:bzr/2.3 |
Diff against target: |
43 lines (+12/-0) 3 files modified
bzrlib/errors.py (+1/-0) bzrlib/tests/test_errors.py (+8/-0) doc/en/release-notes/bzr-2.3.txt (+3/-0) |
To merge this branch: | bzr merge lp:~gz/bzr/2.3_unprintable_retrywithnewpacks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+81827@code.launchpad.net |
Commit message
Store context argument to RetryWithNewPacks which stops stringification breaking
Description of the change
Merge Andrew's fix for the RetryWithNewPacks exception not being printable, due to missing the context attribute. The exception is not intended to bubble up to users at all, and this doesn't tackle the underlying problem in bug 709349 but may as well be resolved separately now.
Proposing against 2.3 as that's what his branch was, and it's a safe and obvious fix.
To post a comment you must log in.
Safe and obvious indeed, green light to merge in 2.3 and up to trunk
Just one question:
26 + '{context} {exc value}', str(error))
is error not an exception or is it safe to call str() here ? If the later, I'll warmly welcome some idiot-proof guide on when that's the case ;)