debian/NEWS: Mention new pinning algorithm added in 2.0~exp1

[apt.git] / apt-pkg / metaindex.cc

diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc
index 3c1b696bdf78c8a2cdd5daba8b867c6b13d507d1..1632b928cfb57f4a1e40b3ab4f92207b44eea67c 100644 (file)
--- a/apt-pkg/metaindex.cc
+++ b/apt-pkg/metaindex.cc
@@ -3,26 +3,10 @@
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.h>
 
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.h>
 

-#include <stddef.h>
-

 #include <string>
 #include <vector>
                                                                        /*}}}*/
 
 #include <string>
 #include <vector>
                                                                        /*}}}*/
 

-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-std::string metaIndex::LocalFileName() const { return ""; }
-#else
-#include <apt-pkg/debmetaindex.h>
-std::string metaIndex::LocalFileName() const
-{
-   debReleaseIndex const * deb = dynamic_cast<debReleaseIndex const*>(this);
-   if (deb != NULL)
-      return deb->LocalFileName();
-
-   return "";
-}
-#endif
-

 std::string metaIndex::Describe() const
 {
    return "Release";
 std::string metaIndex::Describe() const
 {
    return "Release";


@@ -38,10 +22,10 @@ bool metaIndex::Merge(pkgCacheGenerator &Gen,OpProgress *) const
    return Gen.SelectReleaseFile("", "");
 }
 
    return Gen.SelectReleaseFile("", "");
 }
 

-

 metaIndex::metaIndex(std::string const &URI, std::string const &Dist,
       char const * const Type)
 metaIndex::metaIndex(std::string const &URI, std::string const &Dist,
       char const * const Type)

-: Indexes(NULL), Type(Type), URI(URI), Dist(Dist), Trusted(false)
+: d(NULL), Indexes(NULL), Type(Type), URI(URI), Dist(Dist), Trusted(TRI_UNSET),
+   Date(0), ValidUntil(0), SupportsAcquireByHash(false), LoadedSuccessfully(TRI_UNSET)

 {
    /* nothing */
 }
 {
    /* nothing */
 }


@@ -55,3 +39,61 @@ metaIndex::~metaIndex()
       delete *I;
    delete Indexes;
 }
       delete *I;
    delete Indexes;
 }

+
+// one line Getters for public fields                                  /*{{{*/
+APT_PURE std::string metaIndex::GetURI() const { return URI; }
+APT_PURE std::string metaIndex::GetDist() const { return Dist; }
+APT_PURE const char* metaIndex::GetType() const { return Type; }
+APT_PURE metaIndex::TriState metaIndex::GetTrusted() const { return Trusted; }
+APT_PURE std::string metaIndex::GetSignedBy() const { return SignedBy; }
+APT_PURE std::string metaIndex::GetCodename() const { return Codename; }
+APT_PURE std::string metaIndex::GetSuite() const { return Suite; }
+APT_PURE bool metaIndex::GetSupportsAcquireByHash() const { return SupportsAcquireByHash; }
+APT_PURE time_t metaIndex::GetValidUntil() const { return ValidUntil; }
+APT_PURE time_t metaIndex::GetDate() const { return this->Date; }
+APT_PURE metaIndex::TriState metaIndex::GetLoadedSuccessfully() const { return LoadedSuccessfully; }
+
+APT_PURE bool metaIndex::CheckDist(string const &MaybeDist) const
+{
+   return (this->Codename == MaybeDist
+          || this->Suite == MaybeDist);
+}
+APT_PURE std::string metaIndex::GetExpectedDist() const
+{
+   // TODO: Used to be an explicit value set in the constructor
+   return "";
+}
+                                                                       /*}}}*/
+APT_PURE metaIndex::checkSum *metaIndex::Lookup(string const &MetaKey) const /*{{{*/
+{
+   std::map<std::string, metaIndex::checkSum* >::const_iterator sum = Entries.find(MetaKey);
+   if (sum == Entries.end())
+      return NULL;
+   return sum->second;
+}
+                                                                       /*}}}*/
+APT_PURE bool metaIndex::Exists(string const &MetaKey) const           /*{{{*/
+{
+   return Entries.find(MetaKey) != Entries.end();
+}
+                                                                       /*}}}*/
+std::vector<std::string> metaIndex::MetaKeys() const                   /*{{{*/
+{
+   std::vector<std::string> keys;
+   std::map<string,checkSum *>::const_iterator I = Entries.begin();
+   while(I != Entries.end()) {
+      keys.push_back((*I).first);
+      ++I;
+   }
+   return keys;
+}
+                                                                       /*}}}*/
+void metaIndex::swapLoad(metaIndex * const OldMetaIndex)               /*{{{*/
+{
+   std::swap(Entries, OldMetaIndex->Entries);
+   std::swap(Date, OldMetaIndex->Date);
+   std::swap(ValidUntil, OldMetaIndex->ValidUntil);
+   std::swap(SupportsAcquireByHash, OldMetaIndex->SupportsAcquireByHash);
+   std::swap(LoadedSuccessfully, OldMetaIndex->LoadedSuccessfully);
+}
+                                                                       /*}}}*/