From ce47cf58660b53cf06ddce11492dacf62839e831 Mon Sep 17 00:00:00 2001 From: Flor Elisa Chacon Ochoa Date: Thu, 14 Mar 2024 13:35:29 -0700 Subject: [PATCH] PR suggestion --- src/AppInstallerCLICore/Commands/SettingsCommand.cpp | 4 +--- src/AppInstallerCLICore/Workflows/SettingsFlow.cpp | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/AppInstallerCLICore/Commands/SettingsCommand.cpp b/src/AppInstallerCLICore/Commands/SettingsCommand.cpp index 0cd2451ea2..b0e5ef77a9 100644 --- a/src/AppInstallerCLICore/Commands/SettingsCommand.cpp +++ b/src/AppInstallerCLICore/Commands/SettingsCommand.cpp @@ -147,7 +147,6 @@ namespace AppInstaller::CLI Utility::LocIndString validOptions = Join(", "_liv, adminSettingList); if (StringAdminSetting::Unknown == StringToStringAdminSetting(execArgs.GetArg(Execution::Args::Type::SettingName)) - { throw CommandException(Resource::String::InvalidArgumentValueError(ArgumentCommon::ForType(Execution::Args::Type::SettingName).Name, validOptions)); } @@ -198,8 +197,7 @@ namespace AppInstaller::CLI Utility::LocIndString validOptions = Join(", "_liv, adminSettingList); - if (execArgs.Contains(Execution::Args::Type::SettingName) - && StringAdminSetting::Unknown == StringToStringAdminSetting(execArgs.GetArg(Execution::Args::Type::SettingName)) + if (StringAdminSetting::Unknown == StringToStringAdminSetting(execArgs.GetArg(Execution::Args::Type::SettingName)) && BoolAdminSetting::Unknown == StringToBoolAdminSetting(execArgs.GetArg(Execution::Args::Type::SettingName))) { throw CommandException(Resource::String::InvalidArgumentValueError(ArgumentCommon::ForType(Execution::Args::Type::SettingName).Name, validOptions)); diff --git a/src/AppInstallerCLICore/Workflows/SettingsFlow.cpp b/src/AppInstallerCLICore/Workflows/SettingsFlow.cpp index 32e7cc8e54..49eca405cd 100644 --- a/src/AppInstallerCLICore/Workflows/SettingsFlow.cpp +++ b/src/AppInstallerCLICore/Workflows/SettingsFlow.cpp @@ -108,7 +108,6 @@ namespace AppInstaller::CLI::Workflow context.Reporter.Info() << Resource::String::ResetAdminSettingSucceeded(LocIndString{ adminSettingName }) << std::endl; } else - { context.Reporter.Error() << Resource::String::ResetAdminSettingFailed(LocIndString{ adminSettingName }) << std::endl; }