ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

can't log self! bluh

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-02-25 21:25:55 -05:00
parent 437084c300
commit 79bfb8acb6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/allmydata/frontends/magic_folder.py
View File

@ -1499,13 +1499,19 @@ class WriteFileMixin(object):
OVERWRITE_BECOMES_CONFLICT.log(reason=e)
return self._rename_conflicted_file(abspath_u, replacement_path_u)
@log_call
@log_call(
action_type=u"magic-folder:rename-conflicted",
include_args=["abspath_u", "replacement_path_u"],
)
def _rename_conflicted_file(self, abspath_u, replacement_path_u):
conflict_path_u = self._get_conflicted_filename(abspath_u)
fileutil.rename_no_overwrite(replacement_path_u, conflict_path_u)
return conflict_path_u
@log_call
@log_call(
action_type=u"magic-folder:rename-deleted",
include_args=["abspath_u"],
)
def _rename_deleted_file(self, abspath_u):
try:
fileutil.rename_no_overwrite(abspath_u, abspath_u + u'.backup')