hrev49836 adds 1 changeset to branch 'master'
old head: 709ac637dddf1a28e70ee1f7d4345142d3a06c1d
new head: 43c29278869c547a739b1bd4703928aed3115fce
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=43c29278869c+%5E709ac637dddf
----------------------------------------------------------------------------
43c29278869c: pkgman: show old version when updating packages.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev49836
Commit: 43c29278869c547a739b1bd4703928aed3115fce
URL: http://cgit.haiku-os.org/haiku/commit/?id=43c29278869c
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Fri Nov 13 10:02:49 2015 UTC
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 2 deletions(-)
src/bin/pkgman/PackageManager.cpp | 8 ++++++--
----------------------------------------------------------------------------
diff --git a/src/bin/pkgman/PackageManager.cpp
b/src/bin/pkgman/PackageManager.cpp
index 4707208..247d492 100644
--- a/src/bin/pkgman/PackageManager.cpp
+++ b/src/bin/pkgman/PackageManager.cpp
@@ -314,6 +314,7 @@ PackageManager::_PrintResult(InstalledRepository&
installationRepository)
= installationRepository.PackagesToDeactivate();
BStringList upgradedPackages;
+ BStringList upgradedPackageVersions;
for (int32 i = 0;
BSolverPackage* installPackage = packagesToActivate.ItemAt(i);
i++) {
@@ -322,6 +323,7 @@ PackageManager::_PrintResult(InstalledRepository&
installationRepository)
j++) {
if (installPackage->Info().Name() ==
uninstallPackage->Info().Name()) {
upgradedPackages.Add(installPackage->Info().Name());
+
upgradedPackageVersions.Add(uninstallPackage->Info().Version().ToString());
break;
}
}
@@ -335,9 +337,11 @@ PackageManager::_PrintResult(InstalledRepository&
installationRepository)
else
repository.SetToFormat("repository %s",
package->Repository()->Name().String());
- if (upgradedPackages.HasString(package->Info().Name())) {
- printf(" upgrade package %s to %s from %s\n",
+ int position = upgradedPackages.IndexOf(package->Info().Name());
+ if (position >= 0) {
+ printf(" upgrade package %s-%s to %s from %s\n",
package->Info().Name().String(),
+
upgradedPackageVersions.StringAt(position).String(),
package->Info().Version().ToString().String(),
repository.String());
} else {
