Merge remote-tracking branch 'mvo/feature/apt-binary2' into debian/sid

Conflicts:
	cmdline/apt-get.cc

1 files changed, 63 insertions, 0 deletions

diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
new file mode 100644
index 000000000..6fb224010
--- /dev/null
+++ b/apt-private/private-cacheset.cc
@@ -0,0 +1,63 @@
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/strutl.h>
+
+#include "private-cacheset.h"
+
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
+                                 LocalitySortedVersionSet &output_set,
+                                 OpProgress &progress)
+{
+    Matcher null_matcher = Matcher();
+    return GetLocalitySortedVersionSet(CacheFile, output_set, 
+                                       null_matcher, progress);
+}
+
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
+                                 LocalitySortedVersionSet &output_set,
+                                 Matcher &matcher,
+                                 OpProgress &progress)
+{
+   pkgCache *Cache = CacheFile.GetPkgCache();
+   pkgDepCache *DepCache = CacheFile.GetDepCache();
+
+   int Done=0;
+   progress.SubProgress(Cache->Head().PackageCount, _("Sorting"));
+   for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)
+   {
+      if (Done%500 == 0)
+         progress.Progress(Done);
+      Done++;
+
+      if ((matcher)(P) == false)
+         continue;
+
+      // exclude virtual pkgs
+      if (P.VersionList() == 0)
+         continue;
+      pkgDepCache::StateCache &state = (*DepCache)[P];
+      if (_config->FindB("APT::Cmd::Installed") == true)
+      {
+         if (P.CurrentVer() != NULL)
+         {
+            output_set.insert(P.CurrentVer());
+         }
+      }
+      else if (_config->FindB("APT::Cmd::Upgradable") == true)
+      {
+         if(P.CurrentVer() && state.Upgradable())
+         {
+             pkgPolicy *policy = CacheFile.GetPolicy();
+             output_set.insert(policy->GetCandidateVer(P));
+         }
+      }
+      else 
+      {
+         pkgPolicy *policy = CacheFile.GetPolicy();
+         output_set.insert(policy->GetCandidateVer(P));
+      }
+   }
+   progress.Done();
+   return true;
+}