pkgman: PackageManager: Use flags instead of bools in ctor
This commit is contained in:
@@ -73,7 +73,7 @@ PackageManager::Repository::Config() const
|
||||
|
||||
|
||||
PackageManager::PackageManager(BPackageInstallationLocation location,
|
||||
bool addInstalledRepositories, bool addOtherRepositories)
|
||||
uint32 flags)
|
||||
:
|
||||
fLocation(location),
|
||||
fSolver(NULL),
|
||||
@@ -92,7 +92,7 @@ PackageManager::PackageManager(BPackageInstallationLocation location,
|
||||
DIE(error, "failed to create solver");
|
||||
|
||||
// add installation location repositories
|
||||
if (addInstalledRepositories) {
|
||||
if ((flags & ADD_INSTALLED_REPOSITORIES) != 0) {
|
||||
// We add only the repository of our actual installation location as the
|
||||
// "installed" repository. The repositories for the more general
|
||||
// installation locations are added as regular repositories, but with
|
||||
@@ -129,7 +129,7 @@ PackageManager::PackageManager(BPackageInstallationLocation location,
|
||||
}
|
||||
|
||||
// add other repositories
|
||||
if (addOtherRepositories) {
|
||||
if ((flags & ADD_REMOTE_REPOSITORIES) != 0) {
|
||||
BPackageRoster roster;
|
||||
BStringList repositoryNames;
|
||||
error = roster.GetRepositoryNames(repositoryNames);
|
||||
|
||||
@@ -29,11 +29,15 @@ public:
|
||||
struct Repository;
|
||||
typedef BObjectList<Repository> RepositoryList;
|
||||
|
||||
enum {
|
||||
ADD_INSTALLED_REPOSITORIES = 0x01,
|
||||
ADD_REMOTE_REPOSITORIES = 0x02,
|
||||
};
|
||||
|
||||
public:
|
||||
PackageManager(
|
||||
BPackageInstallationLocation location,
|
||||
bool addInstalledRepositories,
|
||||
bool addOtherRepositories);
|
||||
uint32 flags);
|
||||
~PackageManager();
|
||||
|
||||
BSolver* Solver() const
|
||||
|
||||
@@ -85,7 +85,9 @@ InstallCommand::Execute(int argc, const char* const* argv)
|
||||
BPackageInstallationLocation location = installInHome
|
||||
? B_PACKAGE_INSTALLATION_LOCATION_HOME
|
||||
: B_PACKAGE_INSTALLATION_LOCATION_COMMON;
|
||||
PackageManager packageManager(location, true, true);
|
||||
PackageManager packageManager(location,
|
||||
PackageManager::ADD_INSTALLED_REPOSITORIES
|
||||
| PackageManager::ADD_REMOTE_REPOSITORIES);
|
||||
packageManager.Install(packages, packageCount);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -120,7 +120,8 @@ SearchCommand::Execute(int argc, const char* const* argv)
|
||||
|
||||
// create the solver
|
||||
PackageManager packageManager(B_PACKAGE_INSTALLATION_LOCATION_HOME,
|
||||
!uninstalledOnly, !installedOnly);
|
||||
(!uninstalledOnly ? PackageManager::ADD_INSTALLED_REPOSITORIES : 0)
|
||||
| (!installedOnly ? PackageManager::ADD_REMOTE_REPOSITORIES : 0));
|
||||
|
||||
// search
|
||||
BObjectList<BSolverPackage> packages;
|
||||
|
||||
@@ -85,7 +85,9 @@ UninstallCommand::Execute(int argc, const char* const* argv)
|
||||
BPackageInstallationLocation location = uninstallFromHome
|
||||
? B_PACKAGE_INSTALLATION_LOCATION_HOME
|
||||
: B_PACKAGE_INSTALLATION_LOCATION_COMMON;
|
||||
PackageManager packageManager(location, true, true);
|
||||
PackageManager packageManager(location,
|
||||
PackageManager::ADD_INSTALLED_REPOSITORIES
|
||||
| PackageManager::ADD_REMOTE_REPOSITORIES);
|
||||
packageManager.Uninstall(packages, packageCount);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -83,7 +83,9 @@ UpdateCommand::Execute(int argc, const char* const* argv)
|
||||
BPackageInstallationLocation location = installInHome
|
||||
? B_PACKAGE_INSTALLATION_LOCATION_HOME
|
||||
: B_PACKAGE_INSTALLATION_LOCATION_COMMON;
|
||||
PackageManager packageManager(location, true, true);
|
||||
PackageManager packageManager(location,
|
||||
PackageManager::ADD_INSTALLED_REPOSITORIES
|
||||
| PackageManager::ADD_REMOTE_REPOSITORIES);
|
||||
packageManager.Update(packages, packageCount);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user