Show More
@@ -431,22 +431,21 b' class transaction(object):' | |||||
431 | self.opener.unlink(self._backupjournal) |
|
431 | self.opener.unlink(self._backupjournal) | |
432 | if self.opener.isfile(self.journal): |
|
432 | if self.opener.isfile(self.journal): | |
433 | self.opener.unlink(self.journal) |
|
433 | self.opener.unlink(self.journal) | |
434 | if True: |
|
434 | for l, _f, b, c in self._backupentries: | |
435 |
f |
|
435 | if l not in self._vfsmap and c: | |
436 | if l not in self._vfsmap and c: |
|
436 | self.report("couldn't remove %s: unknown cache location" | |
437 | self.report("couldn't remove %s: unknown cache location" |
|
437 | "%s\n" % (b, l)) | |
438 | "%s\n" % (b, l)) |
|
438 | continue | |
439 | continue |
|
439 | vfs = self._vfsmap[l] | |
440 | vfs = self._vfsmap[l] |
|
440 | if b and vfs.exists(b): | |
441 |
|
|
441 | try: | |
442 |
|
|
442 | vfs.unlink(b) | |
443 | vfs.unlink(b) |
|
443 | except (IOError, OSError, error.Abort) as inst: | |
444 | except (IOError, OSError, error.Abort) as inst: |
|
444 | if not c: | |
445 |
|
|
445 | raise | |
446 |
|
|
446 | # Abort may be raise by read only opener | |
447 | # Abort may be raise by read only opener |
|
447 | self.report("couldn't remove %s: %s\n" | |
448 | self.report("couldn't remove %s: %s\n" |
|
448 | % (vfs.join(b), inst)) | |
449 | % (vfs.join(b), inst)) |
|
|||
450 | self._backupentries = [] |
|
449 | self._backupentries = [] | |
451 | self.journal = None |
|
450 | self.journal = None | |
452 |
|
451 |
General Comments 0
You need to be logged in to leave comments.
Login now