admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes from PR #6600 which cause a regression in drive behavior (#6751)

Browse Source 
This reverts the commit 35d8de927b, which caused a regression in drive behavior where drive paths were not restored. See issue #6749.
This commit is contained in:
Robert Holt
2018-04-30 15:25:11 -07:00
committed by Dongbo Wang
parent bee98547e4
commit 9ca059dcf8
2 changed files with 8 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/namespaces/LocationGlobber.cs
+7 -25
View File
@@ -2013,9 +2013,6 @@ namespace System.Management.Automation
// Check to see if the path is relative or absolute
bool isPathForCurrentDrive = false;
// Check to see if the path is to the root of a drive
bool isPathForRootOfDrive = false;
if (IsAbsolutePath(path, out driveName))
{
Dbg.Diagnostics.Assert(
@@ -2083,12 +2080,6 @@ namespace System.Management.Automation
// this is the default behavior for all windows drives, and all non-filesystem
// drives on non-windows
path = path.Substring(driveName.Length + 1);
if (String.IsNullOrEmpty(path))
{
// path was to the root of a drive such as 'c:'
isPathForRootOfDrive = true;
}
}
}
}
@@ -2120,23 +2111,14 @@ namespace System.Management.Automation
// have access to it.
context.Drive = workingDriveForPath;
string relativePath = String.Empty;
string relativePath =
GenerateRelativePath(
workingDriveForPath,
path,
escapeCurrentLocation,
providerInstance,
context);
if (isPathForRootOfDrive)
{
relativePath = context.Drive.Root;
}
else
{
relativePath =
GenerateRelativePath(
workingDriveForPath,
path,
escapeCurrentLocation,
providerInstance,
context);
}
return relativePath;
}
catch (PSNotSupportedException)
test/powershell/Modules/Microsoft.PowerShell.Management/New-Item.Tests.ps1
+1 -28
View File
@@ -117,33 +117,6 @@ Describe "New-Item" -Tags "CI" {
$fileInfo.Target | Should -BeNullOrEmpty
$fileInfo.LinkType | Should -BeExactly "HardLink"
}
It "Should create a file at the root of the drive while the current working directory is not the root" {
try {
New-Item -Name $testfolder -Path "TestDrive:\" -ItemType directory > $null
Push-Location -Path "TestDrive:\$testfolder"
New-Item -Name $testfile -Path "TestDrive:\" -ItemType file > $null
$FullyQualifiedFile | Should -Exist
}
finally {
Pop-Location
}
}
It "Should create a folder at the root of the drive while the current working directory is not the root" {
$testfolder2 = "newDirectory2"
$FullyQualifiedFolder2 = Join-Path -Path $tmpDirectory -ChildPath $testfolder2
try {
New-Item -Name $testfolder -Path "TestDrive:\" -ItemType directory > $null
Push-Location -Path "TestDrive:\$testfolder"
New-Item -Name $testfolder2 -Path "TestDrive:\" -ItemType directory > $null
$FullyQualifiedFolder2 | Should -Exist
}
finally {
Pop-Location
}
}
}
# More precisely these tests require SeCreateSymbolicLinkPrivilege.
@@ -213,7 +186,7 @@ Describe "New-Item with links" -Tags @('CI', 'RequireAdminOnWindows') {
}
It "New-Item -ItemType SymbolicLink should understand directory path ending with slash" {
$folderName = [System.IO.Path]::GetRandomFileName()
$folderName = [System.IO.Path]::GetRandomFileName()
$symbolicLinkPath = New-Item -ItemType SymbolicLink -Path "$tmpDirectory/$folderName/" -Value "/bar/"
$symbolicLinkPath | Should -Not -BeNullOrEmpty
}