Skip to content

[release/v7.2.6] Fix Export-PSSession to not throw error when a rooted path is specified for -OutputModule #17819

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
adityapatwardhan merged 3 commits into from
Aug 5, 2022
Merged

[release/v7.2.6] Fix Export-PSSession to not throw error when a rooted path is specified for -OutputModule #17819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e8b494
Fix Export-PSSession to not throw error when a rooted path is specifi…
daxian-dbw Jul 13, 2022
23b8411
Update comment
daxian-dbw Jul 13, 2022
eb24966
Update src/System.Management.Automation/utils/PathUtils.cs
daxian-dbw Jul 13, 2022
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/System.Management.Automation/resources/PathUtilsStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<value>The directory '{0}' already exists. Use the -Force parameter if you want to overwrite the directory and files within the directory.</value>
</data>
<data name="ExportPSSession_ErrorModuleNameOrPath" xml:space="preserve">
<value>The -OutputModule parameter does not resolve to a path, and a user module path cannot be found for the provided name.</value>
<value>The user module path does not exist, and hence a module folder cannot be created for the provided module name '{0}'.</value>
</data>
<data name="ExportPSSession_CannotCreateOutputDirectory" xml:space="preserve">
<value>Cannot create the module {0} due to the following: {1}. Use a different argument for the -OutputModule parameter and retry.</value>
Expand Down
31 changes: 20 additions & 11 deletions src/System.Management.Automation/utils/PathUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Management.Automation.Internal;
using System.Runtime.CompilerServices;
using System.Text;

using Microsoft.PowerShell.Commands;
using Dbg = System.Management.Automation.Diagnostics;

namespace System.Management.Automation
Expand Down Expand Up @@ -357,7 +357,9 @@ internal static DirectoryInfo CreateModuleDirectory(PSCmdlet cmdlet, string modu
DirectoryInfo directoryInfo = null;
try
{
string rootedPath = Microsoft.PowerShell.Commands.ModuleCmdletBase.ResolveRootedFilePath(moduleNameOrPath, cmdlet.Context);
// Even if 'moduleNameOrPath' is a rooted path, 'ResolveRootedFilePath' may return null when the path doesn't exist yet,
// or when it contains wildcards but cannot be resolved to a single path.
string rootedPath = ModuleCmdletBase.ResolveRootedFilePath(moduleNameOrPath, cmdlet.Context);
if (string.IsNullOrEmpty(rootedPath) && moduleNameOrPath.StartsWith('.'))
{
PathInfo currentPath = cmdlet.CurrentProviderLocation(cmdlet.Context.ProviderNames.FileSystem);
Expand All @@ -366,18 +368,25 @@ internal static DirectoryInfo CreateModuleDirectory(PSCmdlet cmdlet, string modu

if (string.IsNullOrEmpty(rootedPath))
{
string personalModuleRoot = ModuleIntrinsics.GetPersonalModulePath();
if (string.IsNullOrEmpty(personalModuleRoot))
if (Path.IsPathRooted(moduleNameOrPath))
{
cmdlet.ThrowTerminatingError(
new ErrorRecord(
new ArgumentException(PathUtilsStrings.ExportPSSession_ErrorModuleNameOrPath),
"ExportPSSession_ErrorModuleNameOrPath",
ErrorCategory.InvalidArgument,
cmdlet));
rootedPath = moduleNameOrPath;
}
else
{
string personalModuleRoot = ModuleIntrinsics.GetPersonalModulePath();
if (string.IsNullOrEmpty(personalModuleRoot))
{
cmdlet.ThrowTerminatingError(
new ErrorRecord(
new ArgumentException(StringUtil.Format(PathUtilsStrings.ExportPSSession_ErrorModuleNameOrPath, moduleNameOrPath)),
"ExportPSSession_ErrorModuleNameOrPath",
ErrorCategory.InvalidArgument,
cmdlet));
}

rootedPath = Path.Combine(personalModuleRoot, moduleNameOrPath);
rootedPath = Path.Combine(personalModuleRoot, moduleNameOrPath);
}
}

directoryInfo = new DirectoryInfo(rootedPath);
Expand Down