Skip to content

Remove sourceFullPath from Unix FileSystem.MoveDirectory exception #55658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 8 commits into from
Jul 16, 2021
Merged

Remove sourceFullPath from Unix FileSystem.MoveDirectory exception #55658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
16270cd
Update Path.Windows.cs
steveberdy Jul 8, 2021
086bae8
Merge branch 'dotnet:main' into main
steveberdy Jul 8, 2021
ce6bfd2
Change helper method to internal
steveberdy Jul 9, 2021
bdd1e36
Merge branch 'dotnet:main' into main
steveberdy Jul 12, 2021
80cbbe2
Merge branch 'dotnet:main' into main
steveberdy Jul 13, 2021
b88008d
Removed sourceFullPath from Unix FileSystem.MoveDirectory thrown exce…
steveberdy Jul 14, 2021
7890ab4
Undo commit from main fork branch
steveberdy Jul 14, 2021
208b9f4
Revert FileSystem.Windows.cs changes
steveberdy Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/IO/Directory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public static void Move(string sourceDirName, string destDirName)
if (!FileSystem.DirectoryExists(fullsourceDirName) && !FileSystem.FileExists(fullsourceDirName))
throw new DirectoryNotFoundException(SR.Format(SR.IO_PathNotFound_Path, fullsourceDirName));

if (!sameDirectoryDifferentCase // This check is to allowing renaming of directories
if (!sameDirectoryDifferentCase // This check is to allow renaming of directories
&& FileSystem.DirectoryExists(fulldestDirName))
throw new IOException(SR.Format(SR.IO_AlreadyExists_Name, fulldestDirName));

Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/IO/FileSystem.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public static void MoveDirectory(string sourceFullPath, string destFullPath)
// On Windows we end up with ERROR_INVALID_NAME, which is
// "The filename, directory name, or volume label syntax is incorrect."
//
// This surfaces as a IOException, if we let it go beyond here it would
// This surfaces as an IOException, if we let it go beyond here it would
// give DirectoryNotFound.

if (Path.EndsInDirectorySeparator(sourceFullPath))
Expand All @@ -405,7 +405,7 @@ public static void MoveDirectory(string sourceFullPath, string destFullPath)
case Interop.Error.EACCES: // match Win32 exception
throw new IOException(SR.Format(SR.UnauthorizedAccess_IODenied_Path, sourceFullPath), errorInfo.RawErrno);
default:
throw Interop.GetExceptionForIoErrno(errorInfo, sourceFullPath, isDirectory: true);
throw Interop.GetExceptionForIoErrno(errorInfo, isDirectory: true);
}
}
}
Expand Down