Small tweaks

gep13 · gep13 · commit 7e4e59c25887 · 2024-07-14T04:53:41.000-07:00
diff --git a/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs b/src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs
@@ -982,7 +982,7 @@ public IEnumerable<ChocolateyConfiguration> GetPackagesFromConfigFile(string pac
                         packageConfig.ApplyPackageParametersToDependencies = true;
                     }
 
-                    if (!string.IsNullOrWhiteSpace(pkgSettings.SourceType) && HasSourceType(pkgSettings.SourceType, alternativeSourceRunners))
+                    if ((!string.IsNullOrWhiteSpace(pkgSettings.SourceType) && HasSourceType(pkgSettings.SourceType, alternativeSourceRunners)) || pkgSettings.SourceType == "programs" || pkgSettings.SourceType == "dotnet")
                     {
                         packageConfig.SourceType = pkgSettings.SourceType;
                     }
diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -298,11 +298,11 @@ Package url{6}
                         {
                             this.Log().Info(logger, () => "{0}|nuget".FormatWith(package.Identity.Id));
                         }
-                        else if(!config.ListCommand.IdOnly && !config.ListCommand.IncludeAlternativeSources)
+                        else if(!config.ListCommand.IdOnly && !config.ListCommand.IncludeAlternativeSources && !config.ListCommand.IncludeRegistryPrograms)
                         {
                             this.Log().Info(logger, () => "{0}|{1}".FormatWith(package.Identity.Id, package.Identity.Version.ToFullStringChecked()));
                         }
-                        else if(config.ListCommand.IncludeAlternativeSources)
+                        else if(config.ListCommand.IncludeAlternativeSources || config.ListCommand.IncludeRegistryPrograms)
                         {
                             this.Log().Info(logger, () => "{0}|{1}|nuget".FormatWith(package.Identity.Id, package.Identity.Version.ToFullStringChecked()));
                         }

Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,7 @@ public IEnumerable<ChocolateyConfiguration> GetPackagesFromConfigFile(string pac`
`982`	`982`	`packageConfig.ApplyPackageParametersToDependencies = true;`
`983`	`983`	`}`
`984`	`984`
`985`		`- if (!string.IsNullOrWhiteSpace(pkgSettings.SourceType) && HasSourceType(pkgSettings.SourceType, alternativeSourceRunners))`
	`985`	`+ if ((!string.IsNullOrWhiteSpace(pkgSettings.SourceType) && HasSourceType(pkgSettings.SourceType, alternativeSourceRunners)) \|\| pkgSettings.SourceType == "programs" \|\| pkgSettings.SourceType == "dotnet")`
`986`	`986`	`{`
`987`	`987`	`packageConfig.SourceType = pkgSettings.SourceType;`
`988`	`988`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,11 +298,11 @@ Package url{6}`
`298`	`298`	`{`
`299`	`299`	`this.Log().Info(logger, () => "{0}\|nuget".FormatWith(package.Identity.Id));`
`300`	`300`	`}`
`301`		`- else if(!config.ListCommand.IdOnly && !config.ListCommand.IncludeAlternativeSources)`
	`301`	`+ else if(!config.ListCommand.IdOnly && !config.ListCommand.IncludeAlternativeSources && !config.ListCommand.IncludeRegistryPrograms)`
`302`	`302`	`{`
`303`	`303`	`this.Log().Info(logger, () => "{0}\|{1}".FormatWith(package.Identity.Id, package.Identity.Version.ToFullStringChecked()));`
`304`	`304`	`}`
`305`		`- else if(config.ListCommand.IncludeAlternativeSources)`
	`305`	`+ else if(config.ListCommand.IncludeAlternativeSources \|\| config.ListCommand.IncludeRegistryPrograms)`
`306`	`306`	`{`
`307`	`307`	`this.Log().Info(logger, () => "{0}\|{1}\|nuget".FormatWith(package.Identity.Id, package.Identity.Version.ToFullStringChecked()));`
`308`	`308`	`}`