Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / deb / debmetaindex.cc

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index bcc617da7053524ab19bd87de30b39d29b453498..73010e8672100febca469f3bffd1c32b62d81c63 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -1,4 +1,3 @@
-// ijones, walters

 #include <config.h>
 
 #include <apt-pkg/debmetaindex.h>
 #include <config.h>
 
 #include <apt-pkg/debmetaindex.h>


@@ -10,8 +9,15 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/sourcelist.h>

-#include <apt-pkg/error.h>
-
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/macros.h>
+#include <apt-pkg/metaindex.h>
+
+#include <string.h>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>

 #include <set>
 #include <algorithm>
 
 #include <set>
 #include <algorithm>
 


@@ -72,6 +78,22 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const
    return Res;
 }
 
    return Res;
 }
 

+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+std::string debReleaseIndex::LocalFileName() const
+{
+   // see if we have a InRelease file
+   std::string PathInRelease =  MetaIndexFile("InRelease");
+   if (FileExists(PathInRelease))
+      return PathInRelease;
+
+   // and if not return the normal one
+   if (FileExists(PathInRelease))
+      return MetaIndexFile("Release");
+
+   return "";
+}
+#endif
+

 string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const
 {
    string Res ="";
 string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const
 {
    string Res ="";


@@ -164,8 +186,8 @@ debReleaseIndex::~debReleaseIndex() {
                        delete *S;
 }
 
                        delete *S;
 }
 

-vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
-       vector <struct IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
+vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
+       vector <IndexTarget *>* IndexTargets = new vector <IndexTarget *>;

 
        map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
        if (src != ArchEntries.end()) {
 
        map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
        if (src != ArchEntries.end()) {


@@ -229,23 +251,42 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
                                                                        /*}}}*/
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 {
                                                                        /*}}}*/
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 {

+   bool const tryInRelease = _config->FindB("Acquire::TryInRelease", true);
+

    // special case for --print-uris
    if (GetAll) {
    // special case for --print-uris
    if (GetAll) {

-      vector <struct IndexTarget *> *targets = ComputeIndexTargets();
-      for (vector <struct IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target) {
+      vector <IndexTarget *> *targets = ComputeIndexTargets();
+      for (vector <IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target) {

         new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
         new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,

-                        (*Target)->ShortDesc, HashString());
+                        (*Target)->ShortDesc, HashStringList());

       }
       }

+      delete targets;
+
+      // this is normally created in pkgAcqMetaSig, but if we run
+      // in --print-uris mode, we add it here
+      if (tryInRelease == false)
+        new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"),
+              MetaIndexInfo("Release"), "Release",
+              MetaIndexURI("Release.gpg"),
+              ComputeIndexTargets(),
+              new indexRecords (Dist));

    }
 
    }
 

-       new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"),
-               MetaIndexInfo("InRelease"), "InRelease",
-               MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
-               MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
-               ComputeIndexTargets(),
-               new indexRecords (Dist));
+   if (tryInRelease == true)
+      new pkgAcqMetaClearSig(Owner, MetaIndexURI("InRelease"),
+           MetaIndexInfo("InRelease"), "InRelease",
+           MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
+           MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
+           ComputeIndexTargets(),
+           new indexRecords (Dist));
+   else
+      new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"),
+           MetaIndexInfo("Release.gpg"), "Release.gpg",
+           MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
+           ComputeIndexTargets(),
+           new indexRecords (Dist));

 
 

-       return true;
+   return true;

 }
 
 void debReleaseIndex::SetTrusted(bool const Trusted)
 }
 
 void debReleaseIndex::SetTrusted(bool const Trusted)


@@ -355,10 +396,29 @@ class debSLTypeDebian : public pkgSourceList::Type
                           string const &Dist, string const &Section,
                           bool const &IsSrc, map<string, string> const &Options) const
    {
                           string const &Dist, string const &Section,
                           bool const &IsSrc, map<string, string> const &Options) const
    {

-      map<string, string>::const_iterator const arch = Options.find("arch");
-      vector<string> const Archs =
+      // parse arch=, arch+= and arch-= settings
+      map<string, string>::const_iterator arch = Options.find("arch");
+      vector<string> Archs =

                (arch != Options.end()) ? VectorizeString(arch->second, ',') :
                                APT::Configuration::getArchitectures();
                (arch != Options.end()) ? VectorizeString(arch->second, ',') :
                                APT::Configuration::getArchitectures();

+      if ((arch = Options.find("arch+")) != Options.end())
+      {
+        std::vector<std::string> const plusArch = VectorizeString(arch->second, ',');
+        for (std::vector<std::string>::const_iterator plus = plusArch.begin(); plus != plusArch.end(); ++plus)
+           if (std::find(Archs.begin(), Archs.end(), *plus) == Archs.end())
+              Archs.push_back(*plus);
+      }
+      if ((arch = Options.find("arch-")) != Options.end())
+      {
+        std::vector<std::string> const minusArch = VectorizeString(arch->second, ',');
+        for (std::vector<std::string>::const_iterator minus = minusArch.begin(); minus != minusArch.end(); ++minus)
+        {
+           std::vector<std::string>::iterator kill = std::find(Archs.begin(), Archs.end(), *minus);
+           if (kill != Archs.end())
+              Archs.erase(kill);
+        }
+      }
+

       map<string, string>::const_iterator const trusted = Options.find("trusted");
 
       for (vector<metaIndex *>::const_iterator I = List.begin();
       map<string, string>::const_iterator const trusted = Options.find("trusted");
 
       for (vector<metaIndex *>::const_iterator I = List.begin();


@@ -411,6 +471,15 @@ class debSLTypeDebian : public pkgSourceList::Type
    }
 };
 
    }
 };
 

+debDebFileMetaIndex::debDebFileMetaIndex(std::string const &DebFile)
+   : metaIndex(DebFile, "local-uri", "deb-dist"), DebFile(DebFile)
+{
+   DebIndex = new debDebPkgFileIndex(DebFile);
+   Indexes = new vector<pkgIndexFile *>();
+   Indexes->push_back(DebIndex);
+}
+
+

 class debSLTypeDeb : public debSLTypeDebian
 {
    public:
 class debSLTypeDeb : public debSLTypeDebian
 {
    public:


@@ -447,5 +516,25 @@ class debSLTypeDebSrc : public debSLTypeDebian
    }   
 };
 
    }   
 };
 

+class debSLTypeDebFile : public pkgSourceList::Type
+{
+   public:
+
+   bool CreateItem(vector<metaIndex *> &List, string const &URI,
+                  string const &/*Dist*/, string const &/*Section*/,
+                  std::map<string, string> const &/*Options*/) const
+   {
+      metaIndex *mi = new debDebFileMetaIndex(URI);
+      List.push_back(mi);
+      return true;
+   }
+   
+   debSLTypeDebFile()
+   {
+      Name = "deb-file";
+      Label = "Debian Deb File";
+   }   
+};

 debSLTypeDeb _apt_DebType;
 debSLTypeDebSrc _apt_DebSrcType;
 debSLTypeDeb _apt_DebType;
 debSLTypeDebSrc _apt_DebSrcType;

+debSLTypeDebFile _apt_DebFileType;