~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/cleanup.py

  • Committer: Martin Packman
  • Date: 2011-12-05 14:21:55 UTC
  • mfrom: (6015.44.9 2.4)
  • mto: This revision was merged to the branch mainline in revision 6345.
  • Revision ID: martin.packman@canonical.com-20111205142155-t7s4lr5aau50dp8i
Merge 2.4 into bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
188
188
                # but don't propagate them.
189
189
                _run_cleanup(cleanup, *c_args, **kwargs)
190
190
        if exc_info is not None:
191
 
            raise exc_info[0], exc_info[1], exc_info[2]
 
191
            try:
 
192
                raise exc_info[0], exc_info[1], exc_info[2]
 
193
            finally:
 
194
                del exc_info
192
195
        # No error, so we can return the result
193
196
        return result
194
197