From a0cb235c0ebfe6f62a975a884b6eb9a0f3708970 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 29 Aug 2013 23:08:22 +0200 Subject: [PATCH] pkgman: Use BPackageInfo::FileName() instead of Canonical*() --- src/bin/pkgman/PackageManager.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/pkgman/PackageManager.cpp b/src/bin/pkgman/PackageManager.cpp index 8a5a1a9e22..5f7957640c 100644 --- a/src/bin/pkgman/PackageManager.cpp +++ b/src/bin/pkgman/PackageManager.cpp @@ -550,7 +550,7 @@ PackageManager::_PrintResult(InstalledRepository& installationRepository) for (int32 i = 0; BSolverPackage* package = packagesToActivate.ItemAt(i); i++) { printf(" install package %s from repository %s\n", - package->Info().CanonicalFileName().String(), + package->Info().FileName().String(), package->Repository()->Name().String()); } @@ -606,7 +606,7 @@ PackageManager::_ApplyPackageChanges( i++) { // get package URL and target entry - BString fileName(package->Info().CanonicalFileName()); + BString fileName(package->Info().FileName()); if (fileName.IsEmpty()) DIE(B_NO_MEMORY, "failed to allocate file name"); @@ -644,8 +644,7 @@ PackageManager::_ApplyPackageChanges( for (int32 i = 0; BSolverPackage* package = packagesToDeactivate.ItemAt(i); i++) { // add package to transaction - if (!transaction.AddPackageToDeactivate( - package->Info().CanonicalFileName())) { + if (!transaction.AddPackageToDeactivate(package->Info().FileName())) { DIE(B_NO_MEMORY, "failed to add package to deactivate to transaction"); }