← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Ian Clatworthy
  • Date: 2009-06-03 05:44:18 UTC
  • mfrom: (4354.6.1 bzr_wc)
  • mto: This revision was merged to the branch mainline in revision 4400.
  • Revision ID: ian.clatworthy@canonical.com-20090603054418-foc7issbxwxzh2a5
(igc) address temp file issue with diff --using on Windows (Martitza Mendez)

Show diffs side-by-side

added added

removed removed

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