Skip to content

(#962) Upgrade outdated on install #1204

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

(#962) Upgrade outdated on install #1204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
470f83e
(GH-962) Upgrade outdated package on install
Mar 20, 2017
b02c182
Merge branch 'master' of https://github.com/chocolatey/choco into Upg…
Mar 20, 2017
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
41 changes: 40 additions & 1 deletion src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,8 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu

foreach (var packageConfig in set_config_from_package_names_and_packages_config(config, packageInstalls).or_empty_list_if_null())
{
upgrade_outdated_packages_and_remove_from_config(packageConfig);

Action<PackageResult> action = null;
if (packageConfig.SourceType == SourceType.normal)
{
Expand Down Expand Up @@ -1303,5 +1305,42 @@ private void get_log_environment_changes(ChocolateyConfiguration config, IEnumer
}
}
}

private void upgrade_outdated_packages_and_remove_from_config(ChocolateyConfiguration config)
{
if (string.IsNullOrEmpty(config.Version)) return;

var notifyOnlyUpgrade = config.UpgradeCommand.NotifyOnlyAvailableUpgrades;
config.UpgradeCommand.NotifyOnlyAvailableUpgrades = true;
var output = config.RegularOutput;
config.RegularOutput = false;
var outdatedPackages = _nugetService.upgrade_noop(config, null);
config.RegularOutput = output;
config.UpgradeCommand.NotifyOnlyAvailableUpgrades = notifyOnlyUpgrade;

var configVersion = new SemanticVersion(config.Version);
var packageIdsToUpdate = outdatedPackages
.Where(p => p.Value.Package != null && p.Value.Success && !p.Value.Inconclusive
&& configVersion >= p.Value.Package.Version
&& !_packageInfoService.get_package_information(p.Value.Package).IsSideBySide)
.Select(p => p.Value.Package.Id).ToArray();

if (packageIdsToUpdate.Length == 0) return;

// Remove the package names that are going to be upgraded from original config
var optionalPacakgeSeparator = ApplicationParameters.PackageNamesSeparator + "?";
config.PackageNames = System.Text.RegularExpressions.Regex.Replace(
config.PackageNames,
"(" + string.Join(optionalPacakgeSeparator + "|", packageIdsToUpdate) + optionalPacakgeSeparator + ")",
"");

var updateConfig = config.deep_copy();
updateConfig.PackageNames = string.Join(ApplicationParameters.PackageNamesSeparator, packageIdsToUpdate);

this.Log().Warn("{0}{1} already installed. Performing upgrade instead.{0}"
.format_with(Environment.NewLine, updateConfig.PackageNames.Replace(ApplicationParameters.PackageNamesSeparator, ", ")));

upgrade_run(updateConfig);
}
}
}
}