i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgman: show old version when updating packages.

Browse Source
This commit is contained in:
Adrien Destugues
2015-11-13 11:02:49 +01:00
parent 709ac637dd
commit 43c2927886
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/pkgman/PackageManager.cpp
+6 -2
View File
@@ -314,6 +314,7 @@ PackageManager::_PrintResult(InstalledRepository& installationRepository)
= installationRepository.PackagesToDeactivate(); = installationRepository.PackagesToDeactivate();
BStringList upgradedPackages; BStringList upgradedPackages;
BStringList upgradedPackageVersions;
for (int32 i = 0; for (int32 i = 0;
BSolverPackage* installPackage = packagesToActivate.ItemAt(i); BSolverPackage* installPackage = packagesToActivate.ItemAt(i);
i++) { i++) {
@@ -322,6 +323,7 @@ PackageManager::_PrintResult(InstalledRepository& installationRepository)
j++) { j++) {
if (installPackage->Info().Name() == uninstallPackage->Info().Name()) { if (installPackage->Info().Name() == uninstallPackage->Info().Name()) {
upgradedPackages.Add(installPackage->Info().Name()); upgradedPackages.Add(installPackage->Info().Name());
upgradedPackageVersions.Add(uninstallPackage->Info().Version().ToString());
break; break;
} }
} }
@@ -335,9 +337,11 @@ PackageManager::_PrintResult(InstalledRepository& installationRepository)
else else
repository.SetToFormat("repository %s", package->Repository()->Name().String()); repository.SetToFormat("repository %s", package->Repository()->Name().String());
if (upgradedPackages.HasString(package->Info().Name())) { int position = upgradedPackages.IndexOf(package->Info().Name());
printf(" upgrade package %s to %s from %s\n", if (position >= 0) {
printf(" upgrade package %s-%s to %s from %s\n",
package->Info().Name().String(), package->Info().Name().String(),
upgradedPackageVersions.StringAt(position).String(),
package->Info().Version().ToString().String(), package->Info().Version().ToString().String(),
repository.String()); repository.String());
} else { } else {