Change error message when using New-Item to create a symlink and the item exists (#3703)

jeffbi · daxian-dbw · commit 938e13602b43 · 2017-05-05T10:09:34.000-07:00
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -2208,7 +2208,8 @@ protected override void NewItem(
                     {
                         if (symLinkExists)
                         {
-                            WriteError(new ErrorRecord(new IOException("NewItemIOError"), "NewItemIOError", ErrorCategory.ResourceExists, path));
+                            string message = StringUtil.Format(FileSystemProviderStrings.SymlinkItemExists, path);
+                            WriteError(new ErrorRecord(new IOException(message), "SymLinkExists", ErrorCategory.ResourceExists, path));
                             return;
                         }
                     }
diff --git a/src/System.Management.Automation/resources/FileSystemProviderStrings.resx b/src/System.Management.Automation/resources/FileSystemProviderStrings.resx
@@ -336,4 +336,7 @@
   <data name="DriveMaxSizeError" xml:space="preserve">
     <value>Maximum size for drive has been exceeded: {0}.</value>
   </data>
-</root>
+  <data name="SymlinkItemExists" xml:space="preserve">
+    <value>Cannot create symbolic link because the path {0} already exists.</value>
+  </data>
+</root>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
@@ -344,6 +344,9 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
             $link.LinkType | Should BeExactly "SymbolicLink"
             $link.Target | Should Be $nonFile
         }
+        It "New-Item emits an error when path to symbolic link already exists." {
+            { New-Item -ItemType SymbolicLink -Path $realDir -Value $symLinkToDir -ErrorAction Stop } | ShouldBeErrorId "SymLinkExists,Microsoft.PowerShell.Commands.NewItemCommand"
+        }
         It "New-Item can create a symbolic link to a directory" -Skip:($IsWindows) {
             New-Item -ItemType SymbolicLink -Path $symLinkToDir -Value $realDir
             Test-Path $symLinkToDir | Should Be $true

Original file line number	Diff line number	Diff line change
`@@ -2208,7 +2208,8 @@ protected override void NewItem(`
`2208`	`2208`	`{`
`2209`	`2209`	`if (symLinkExists)`
`2210`	`2210`	`{`
`2211`		`- WriteError(new ErrorRecord(new IOException("NewItemIOError"), "NewItemIOError", ErrorCategory.ResourceExists, path));`
	`2211`	`+ string message = StringUtil.Format(FileSystemProviderStrings.SymlinkItemExists, path);`
	`2212`	`+ WriteError(new ErrorRecord(new IOException(message), "SymLinkExists", ErrorCategory.ResourceExists, path));`
`2212`	`2213`	`return;`
`2213`	`2214`	`}`
`2214`	`2215`	`}`