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

  • Committer: Martitza Mendez
  • Date: 2009-05-13 03:55:25 UTC
  • mto: (4399.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4400.
  • Revision ID: martitza@rubuntu-20090513035525-zhziy88frpwe3wtr
Fix 363837 : catch OSError from osutils.rmtree and mutter to trace file.
update NEWS accordingly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
731
731
        return old_disk_path, new_disk_path
732
732
 
733
733
    def finish(self):
734
 
        osutils.rmtree(self._root)
 
734
        try:
 
735
            osutils.rmtree(self._root)
 
736
        except OSError, e:
 
737
            if e.errno != errno.ENOENT:
 
738
                mutter("The temporary directory \"%s\" was not cleanly removed." % self._root)
735
739
 
736
740
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
737
741
        if (old_kind, new_kind) != ('file', 'file'):