summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-06-10 13:09:23 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-06-10 13:09:23 +0200
commita8ef7efd6df81d4fb9e52419695f10df9fe76cda (patch)
tree67a39f65d7c73f874b20af0026d3ec3462506a7a /apt-pkg
parent97f4026d93a85838439263d30146c3ad25fef474 (diff)
* apt-pkg/cacheset.cc:
- get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/cachefile.h8
-rw-r--r--apt-pkg/cacheset.cc11
2 files changed, 14 insertions, 5 deletions
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 1647aff8e..c68f06ed8 100644
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -20,10 +20,9 @@
#include <apt-pkg/depcache.h>
#include <apt-pkg/acquire.h>
+#include <apt-pkg/policy.h>
#include <apt-pkg/sourcelist.h>
-class pkgPolicy;
-class pkgSourceList;
class pkgCacheFile
{
protected:
@@ -65,6 +64,11 @@ class pkgCacheFile
inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; };
inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; };
+ inline bool IsPkgCacheBuilt() const { return (Cache != NULL); };
+ inline bool IsDepCacheBuilt() const { return (DCache != NULL); };
+ inline bool IsPolicyBuilt() const { return (Policy != NULL); };
+ inline bool IsSrcListBuilt() const { return (SrcList != NULL); };
+
pkgCacheFile();
virtual ~pkgCacheFile();
};
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 43ade4b4e..e91b56997 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -261,9 +261,14 @@ bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset,
// getCandidateVer - Returns the candidate version of the given package /*{{{*/
pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache,
pkgCache::PkgIterator const &Pkg, bool const &AllowError) {
- if (unlikely(Cache.BuildDepCache() == false))
- return pkgCache::VerIterator(*Cache);
- pkgCache::VerIterator Cand = Cache[Pkg].CandidateVerIter(Cache);
+ pkgCache::VerIterator Cand;
+ if (Cache.IsDepCacheBuilt() == true)
+ Cand = Cache[Pkg].CandidateVerIter(Cache);
+ else {
+ if (unlikely(Cache.BuildPolicy() == false))
+ return pkgCache::VerIterator(*Cache);
+ Cand = Cache.GetPolicy()->GetCandidateVer(Pkg);
+ }
if (AllowError == false && Cand.end() == true)
_error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str());
return Cand;