equal
deleted
inserted
replaced
143 util.copyfile(backuppath, filepath, checkambig=checkambig) |
143 util.copyfile(backuppath, filepath, checkambig=checkambig) |
144 backupfiles.append((vfs, b)) |
144 backupfiles.append((vfs, b)) |
145 except IOError as exc: |
145 except IOError as exc: |
146 e_msg = stringutil.forcebytestr(exc) |
146 e_msg = stringutil.forcebytestr(exc) |
147 report(_(b"failed to recover %s (%s)\n") % (f, e_msg)) |
147 report(_(b"failed to recover %s (%s)\n") % (f, e_msg)) |
|
148 raise |
148 else: |
149 else: |
149 target = f or b |
150 target = f or b |
150 try: |
151 try: |
151 vfs.unlink(target) |
152 vfs.unlink(target) |
152 except FileNotFoundError: |
153 except FileNotFoundError: |