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

pkgman: Use BPackageInfo::FileName() instead of Canonical*()

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-29 23:19:14 +02:00
parent dda51ada4c
commit a0cb235c0e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/pkgman/PackageManager.cpp
+3 -4
View File
@@ -550,7 +550,7 @@ PackageManager::_PrintResult(InstalledRepository& installationRepository)
for (int32 i = 0; BSolverPackage* package = packagesToActivate.ItemAt(i); for (int32 i = 0; BSolverPackage* package = packagesToActivate.ItemAt(i);
i++) { i++) {
printf(" install package %s from repository %s\n", printf(" install package %s from repository %s\n",
package->Info().CanonicalFileName().String(), package->Info().FileName().String(),
package->Repository()->Name().String()); package->Repository()->Name().String());
} }
@@ -606,7 +606,7 @@ PackageManager::_ApplyPackageChanges(
i++) { i++) {
// get package URL and target entry // get package URL and target entry
BString fileName(package->Info().CanonicalFileName()); BString fileName(package->Info().FileName());
if (fileName.IsEmpty()) if (fileName.IsEmpty())
DIE(B_NO_MEMORY, "failed to allocate file name"); DIE(B_NO_MEMORY, "failed to allocate file name");
@@ -644,8 +644,7 @@ PackageManager::_ApplyPackageChanges(
for (int32 i = 0; BSolverPackage* package = packagesToDeactivate.ItemAt(i); for (int32 i = 0; BSolverPackage* package = packagesToDeactivate.ItemAt(i);
i++) { i++) {
// add package to transaction // add package to transaction
if (!transaction.AddPackageToDeactivate( if (!transaction.AddPackageToDeactivate(package->Info().FileName())) {
package->Info().CanonicalFileName())) {
DIE(B_NO_MEMORY, DIE(B_NO_MEMORY,
"failed to add package to deactivate to transaction"); "failed to add package to deactivate to transaction");
} }