nix-community/nix-on-droid-app
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid-app.git synced 2025-12-21 08:21:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Fix duplicate logging of file word in FileUtils.copyOrMoveFile()

Browse source
This commit is contained in:
agnostic-apollo 2022-06-11 14:24:26 +05:00
parent f9e9193c4e
commit 0328d15ea7
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
termux-shared/src/main/java/com/termux/shared/file/FileUtils.java
View file

@ -991,7 +991,7 @@ public class FileUtils {
return FileUtilsErrno.ERRNO_CANNOT_OVERWRITE_A_DIFFERENT_FILE_TYPE.getError(label + "source file", mode.toLowerCase(), srcFilePath, destFilePath, destFileType.getName(), srcFileType.getName()); return FileUtilsErrno.ERRNO_CANNOT_OVERWRITE_A_DIFFERENT_FILE_TYPE.getError(label + "source file", mode.toLowerCase(), srcFilePath, destFilePath, destFileType.getName(), srcFileType.getName());
// Delete the destination file // Delete the destination file
error = deleteFile(label + "destination file", destFilePath, true); error = deleteFile(label + "destination", destFilePath, true);
if (error != null) if (error != null)
return error; return error;
} }
@ -1038,7 +1038,7 @@ public class FileUtils {
} else { } else {
// read the target for the source file and create a symlink at dest // read the target for the source file and create a symlink at dest
// source file metadata will be lost // source file metadata will be lost
error = createSymlinkFile(label + "dest file", Os.readlink(srcFilePath), destFilePath); error = createSymlinkFile(label + "dest", Os.readlink(srcFilePath), destFilePath);
if (error != null) if (error != null)
return error; return error;
} }
@ -1055,7 +1055,7 @@ public class FileUtils {
// If source file had to be moved // If source file had to be moved
if (moveFile) { if (moveFile) {
// Delete the source file since copying would have succeeded // Delete the source file since copying would have succeeded
error = deleteFile(label + "source file", srcFilePath, true); error = deleteFile(label + "source", srcFilePath, true);
if (error != null) if (error != null)
return error; return error;
} }