From 334a5a566c49d247cd8b4491cd3c94748f7df18b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 12 Apr 2013 13:42:27 +0200 Subject: [PATCH] BSolverRepository: Change priority from uint8 to int32 This allows us to specifies priorities below and above the user definable range. --- headers/os/package/solver/SolverRepository.h | 7 ++++--- src/kits/package/solver/LibsolvSolver.cpp | 2 +- src/kits/package/solver/SolverRepository.cpp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/headers/os/package/solver/SolverRepository.h b/headers/os/package/solver/SolverRepository.h index 1cd7fa2120..2d470d131b 100644 --- a/headers/os/package/solver/SolverRepository.h +++ b/headers/os/package/solver/SolverRepository.h @@ -51,8 +51,9 @@ public: BString Name() const; - uint8 Priority() const; - void SetPriority(uint8 priority); + int32 Priority() const; + void SetPriority(int32 priority); + // negative priority is fine bool IsEmpty() const; int32 CountPackages() const; @@ -70,7 +71,7 @@ private: private: BString fName; - uint8 fPriority; + int32 fPriority; bool fIsInstalled; PackageList fPackages; uint64 fChangeCount; diff --git a/src/kits/package/solver/LibsolvSolver.cpp b/src/kits/package/solver/LibsolvSolver.cpp index 885f76e82c..d6a0935856 100644 --- a/src/kits/package/solver/LibsolvSolver.cpp +++ b/src/kits/package/solver/LibsolvSolver.cpp @@ -588,7 +588,7 @@ LibsolvSolver::_AddRepositories() Repo* repo = repo_create(fPool, repository->Name()); repositoryInfo->SetSolvRepo(repo); - repo->priority = 256 - repository->Priority(); + repo->priority = -1 - repository->Priority(); repo->appdata = (void*)repositoryInfo; int32 packageCount = repository->CountPackages(); diff --git a/src/kits/package/solver/SolverRepository.cpp b/src/kits/package/solver/SolverRepository.cpp index 1e710178f4..b968dc3217 100644 --- a/src/kits/package/solver/SolverRepository.cpp +++ b/src/kits/package/solver/SolverRepository.cpp @@ -209,7 +209,7 @@ BSolverRepository::Name() const } -uint8 +int32 BSolverRepository::Priority() const { return fPriority; @@ -217,7 +217,7 @@ BSolverRepository::Priority() const void -BSolverRepository::SetPriority(uint8 priority) +BSolverRepository::SetPriority(int32 priority) { fPriority = priority; fChangeCount++;