Skip to content

Commit 53264d2

Browse files
corbobAdmiringWorm
corbob
authored and
AdmiringWorm
committed
(maint) Remove unnecessary variable usage
In the NugetService we were using a nullResult variable to allow us to add messages to the result. We do not need this variable if we're only adding a single message. This commit removes the unnecessary variables.
1 parent d77c0bd commit 53264d2

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

Diff for: ‎src/chocolatey/infrastructure.app/services/NugetService.cs

+21-15
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@ public virtual ConcurrentDictionary<string, PackageResult> Install(ChocolateyCon
605605
if (installedPackage != null && (version == null || version == installedPackage.PackageMetadata.Version) && !config.Force)
606606
{
607607
var logMessage = "{0} v{1} already installed.{2} Use --force to reinstall, specify a version to install, or try upgrade.".FormatWith(installedPackage.Name, installedPackage.Version, Environment.NewLine);
608+
// We need a temporary PackageResult so that we can add to the Messages collection.
608609
var nullResult = packageResultsToReturn.GetOrAdd(packageName, installedPackage);
609610
nullResult.Messages.Add(new ResultMessage(ResultType.Warn, logMessage));
610611
nullResult.Messages.Add(new ResultMessage(ResultType.Inconclusive, logMessage));
@@ -626,8 +627,8 @@ public virtual ConcurrentDictionary<string, PackageResult> Install(ChocolateyCon
626627
if (installedPackage != null && version != null && version < installedPackage.PackageMetadata.Version && !config.AllowDowngrade)
627628
{
628629
var logMessage = StringResources.ErrorMessages.UnableToDowngrade.FormatWith(installedPackage.Name, installedPackage.Version, Environment.NewLine);
629-
var nullResult = packageResultsToReturn.GetOrAdd(packageName, installedPackage);
630-
nullResult.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
630+
packageResultsToReturn.GetOrAdd(packageName, installedPackage)
631+
.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
631632
this.Log().Error(ChocolateyLoggers.Important, logMessage);
632633
continue;
633634
}
@@ -803,9 +804,12 @@ Version was specified as '{0}'. It is possible that version
803804
if (packageDependencyInfo != null && packageResultsToReturn.Any(r => r.Value.Success != true && packageDependencyInfo.Dependencies.Any(d => d.Id == r.Value.Identity.Id)))
804805
{
805806
var logMessage = StringResources.ErrorMessages.DependencyFailedToInstall.FormatWith(packageDependencyInfo.Id);
806-
var x = new PackageResult(packageDependencyInfo.Id, packageDependencyInfo.Version.ToStringSafe(), string.Empty);
807-
var nullResult = packageResultsToReturn.GetOrAdd(packageDependencyInfo.Id, x);
808-
nullResult.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
807+
packageResultsToReturn
808+
.GetOrAdd(
809+
packageDependencyInfo.Id,
810+
new PackageResult(packageDependencyInfo.Id, packageDependencyInfo.Version.ToStringSafe(), string.Empty)
811+
)
812+
.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
809813
this.Log().Error(ChocolateyLoggers.Important, logMessage);
810814

811815
if (config.Features.StopOnFirstPackageFailure)
@@ -836,8 +840,8 @@ Version was specified as '{0}'. It is possible that version
836840
if (!config.AllowDowngrade && packageToUninstall.Identity.HasVersion && packageDependencyInfo.HasVersion && packageDependencyInfo.Version < packageToUninstall.Identity.Version)
837841
{
838842
var logMessage = StringResources.ErrorMessages.UnableToDowngrade.FormatWith(packageToUninstall.Name, packageToUninstall.Version, Environment.NewLine);
839-
var nullResult = packageResultsToReturn.GetOrAdd(packageToUninstall.Name, packageToUninstall);
840-
nullResult.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
843+
packageResultsToReturn.GetOrAdd(packageToUninstall.Name, packageToUninstall)
844+
.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
841845
this.Log().Error(ChocolateyLoggers.Important, logMessage);
842846

843847
if (config.Features.StopOnFirstPackageFailure)
@@ -1184,8 +1188,8 @@ public virtual ConcurrentDictionary<string, PackageResult> Upgrade(ChocolateyCon
11841188
if (version != null && version < installedPackage.PackageMetadata.Version && !config.AllowDowngrade)
11851189
{
11861190
var logMessage = StringResources.ErrorMessages.UnableToDowngrade.FormatWith(installedPackage.PackageMetadata.Id, installedPackage.Version, Environment.NewLine);
1187-
var nullResult = packageResultsToReturn.GetOrAdd(packageName, new PackageResult(installedPackage.PackageMetadata, pathResolver.GetInstallPath(installedPackage.PackageMetadata.Id)));
1188-
nullResult.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
1191+
packageResultsToReturn.GetOrAdd(packageName, new PackageResult(installedPackage.PackageMetadata, pathResolver.GetInstallPath(installedPackage.PackageMetadata.Id)))
1192+
.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
11891193
this.Log().Error(ChocolateyLoggers.Important, logMessage);
11901194
continue;
11911195
}
@@ -1608,9 +1612,11 @@ public virtual ConcurrentDictionary<string, PackageResult> Upgrade(ChocolateyCon
16081612
if (packageResultsToReturn.Any(r => r.Value.Success != true && packageDependencyInfo.Dependencies.Any(d => d.Id == r.Value.Identity.Id)))
16091613
{
16101614
var logMessage = StringResources.ErrorMessages.DependencyFailedToInstall.FormatWith(packageDependencyInfo.Id, packageDependencyInfo.Version);
1611-
var x = new PackageResult(packageDependencyInfo.Id, packageDependencyInfo.Version.ToStringSafe(), string.Empty);
1612-
var nullResult = packageResultsToReturn.GetOrAdd(packageDependencyInfo.Id, x);
1613-
nullResult.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
1615+
packageResultsToReturn.GetOrAdd(
1616+
packageDependencyInfo.Id,
1617+
new PackageResult(packageDependencyInfo.Id, packageDependencyInfo.Version.ToStringSafe(), string.Empty)
1618+
)
1619+
.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
16141620
this.Log().Error(ChocolateyLoggers.Important, logMessage);
16151621

16161622
if (config.Features.StopOnFirstPackageFailure)
@@ -1642,8 +1648,8 @@ public virtual ConcurrentDictionary<string, PackageResult> Upgrade(ChocolateyCon
16421648
if (!config.AllowDowngrade && packageToUninstall.Identity.HasVersion && packageDependencyInfo.HasVersion && packageDependencyInfo.Version < packageToUninstall.Identity.Version)
16431649
{
16441650
var logMessage = StringResources.ErrorMessages.UnableToDowngrade.FormatWith(packageToUninstall.Name, packageToUninstall.Version, Environment.NewLine);
1645-
var nullResult = packageResultsToReturn.GetOrAdd(packageToUninstall.Name, packageToUninstall);
1646-
nullResult.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
1651+
packageResultsToReturn.GetOrAdd(packageToUninstall.Name, packageToUninstall)
1652+
.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
16471653
this.Log().Error(ChocolateyLoggers.Important, logMessage);
16481654

16491655
if (config.Features.StopOnFirstPackageFailure)
@@ -1655,7 +1661,7 @@ public virtual ConcurrentDictionary<string, PackageResult> Upgrade(ChocolateyCon
16551661
}
16561662

16571663
// Package was previously marked inconclusive (not upgraded). We need remove the message since we are now upgrading it.
1658-
// Packages that are inconclusive but successfull are not labeled as successful at the end of the run.
1664+
// Packages that are inconclusive but successful are not labeled as successful at the end of the run.
16591665
var checkResult = packageResultsToReturn.GetOrAdd(packageToUninstall.Name, packageToUninstall);
16601666

16611667
while (checkResult.Inconclusive)

0 commit comments

Comments
 (0)