implement generic config fallback for methods

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 4e5ff0578271e1bd81a9525a53dfda04c039bb03..00053958275cb7d5c5042da4e59604ccc0b13935 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -11,6 +11,7 @@
 #include<config.h>
 
 #include <apt-pkg/sourcelist.h>
 #include<config.h>
 
 #include <apt-pkg/sourcelist.h>

+#include <apt-pkg/cmndline.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>


@@ -20,6 +21,8 @@
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>

+#include <apt-pkg/debindexfile.h>
+#include <apt-pkg/debsrcrecords.h>

 
 #include <ctype.h>
 #include <stddef.h>
 
 #include <ctype.h>
 #include <stddef.h>


@@ -96,8 +99,8 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,      /*{{{*/
    std::map<char const * const, std::pair<char const * const, bool> > mapping;
 #define APT_PLUSMINUS(X, Y) \
    mapping.insert(std::make_pair(X, std::make_pair(Y, true))); \
    std::map<char const * const, std::pair<char const * const, bool> > mapping;
 #define APT_PLUSMINUS(X, Y) \
    mapping.insert(std::make_pair(X, std::make_pair(Y, true))); \

-   mapping.insert(std::make_pair(X "Add", std::make_pair(Y "+", true))); \
-   mapping.insert(std::make_pair(X "Remove", std::make_pair(Y "-", true)))
+   mapping.insert(std::make_pair(X "-Add", std::make_pair(Y "+", true))); \
+   mapping.insert(std::make_pair(X "-Remove", std::make_pair(Y "-", true)))

    APT_PLUSMINUS("Architectures", "arch");
    APT_PLUSMINUS("Languages", "lang");
    APT_PLUSMINUS("Targets", "target");
    APT_PLUSMINUS("Architectures", "arch");
    APT_PLUSMINUS("Languages", "lang");
    APT_PLUSMINUS("Targets", "target");


@@ -108,6 +111,7 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,    /*{{{*/
    mapping.insert(std::make_pair("Valid-Until-Max", std::make_pair("valid-until-max", false)));
    mapping.insert(std::make_pair("Signed-By", std::make_pair("signed-by", false)));
    mapping.insert(std::make_pair("PDiffs", std::make_pair("pdiffs", false)));
    mapping.insert(std::make_pair("Valid-Until-Max", std::make_pair("valid-until-max", false)));
    mapping.insert(std::make_pair("Signed-By", std::make_pair("signed-by", false)));
    mapping.insert(std::make_pair("PDiffs", std::make_pair("pdiffs", false)));

+   mapping.insert(std::make_pair("By-Hash", std::make_pair("by-hash", false)));

 
    for (std::map<char const * const, std::pair<char const * const, bool> >::const_iterator m = mapping.begin(); m != mapping.end(); ++m)
       if (Tags.Exists(m->first))
 
    for (std::map<char const * const, std::pair<char const * const, bool> >::const_iterator m = mapping.begin(); m != mapping.end(); ++m)
       if (Tags.Exists(m->first))


@@ -308,18 +312,19 @@ bool pkgSourceList::ReadMainList()
    Reset();
    // CNC:2003-11-28 - Entries in sources.list have priority over
    //                  entries in sources.list.d.
    Reset();
    // CNC:2003-11-28 - Entries in sources.list have priority over
    //                  entries in sources.list.d.

-   string Main = _config->FindFile("Dir::Etc::sourcelist");
-   string Parts = _config->FindDir("Dir::Etc::sourceparts");
+   string Main = _config->FindFile("Dir::Etc::sourcelist", "/dev/null");
+   string Parts = _config->FindDir("Dir::Etc::sourceparts", "/dev/null");

    
    if (RealFileExists(Main) == true)
       Res &= ReadAppend(Main);
    
    if (RealFileExists(Main) == true)
       Res &= ReadAppend(Main);

-   else if (DirectoryExists(Parts) == false)
+   else if (DirectoryExists(Parts) == false && APT::String::Endswith(Parts, "/dev/null") == false)

       // Only warn if there are no sources.list.d.
       _error->WarningE("DirectoryExists", _("Unable to read %s"), Parts.c_str());
 
    if (DirectoryExists(Parts) == true)
       Res &= ReadSourceDir(Parts);
       // Only warn if there are no sources.list.d.
       _error->WarningE("DirectoryExists", _("Unable to read %s"), Parts.c_str());
 
    if (DirectoryExists(Parts) == true)
       Res &= ReadSourceDir(Parts);

-   else if (RealFileExists(Main) == false)
+   else if (Main.empty() == false && RealFileExists(Main) == false &&
+        APT::String::Endswith(Parts, "/dev/null") == false)

       // Only warn if there is no sources.list file.
       _error->WarningE("RealFileExists", _("Unable to read %s"), Main.c_str());
 
       // Only warn if there is no sources.list file.
       _error->WarningE("RealFileExists", _("Unable to read %s"), Main.c_str());
 


@@ -415,16 +420,16 @@ bool pkgSourceList::ParseFileOldStyle(std::string const &File)
 /* Returns: the number of stanzas parsed*/
 bool pkgSourceList::ParseFileDeb822(string const &File)
 {
 /* Returns: the number of stanzas parsed*/
 bool pkgSourceList::ParseFileDeb822(string const &File)
 {

-   pkgUserTagSection Tags;

    unsigned int i = 1;
 
    // see if we can read the file
    FileFd Fd(File, FileFd::ReadOnly);
    unsigned int i = 1;
 
    // see if we can read the file
    FileFd Fd(File, FileFd::ReadOnly);

-   pkgTagFile Sources(&Fd);
+   pkgTagFile Sources(&Fd, pkgTagFile::SUPPORT_COMMENTS);

    if (Fd.IsOpen() == false || Fd.Failed())
       return _error->Error(_("Malformed stanza %u in source list %s (type)"),i,File.c_str());
 
    // read step by step
    if (Fd.IsOpen() == false || Fd.Failed())
       return _error->Error(_("Malformed stanza %u in source list %s (type)"),i,File.c_str());
 
    // read step by step

+   pkgTagSection Tags;

    while (Sources.Step(Tags) == true)
    {
       if(Tags.Exists("Types") == false)
    while (Sources.Step(Tags) == true)
    {
       if(Tags.Exists("Types") == false)


@@ -535,7 +540,80 @@ std::vector<pkgIndexFile*> pkgSourceList::GetVolatileFiles() const /*{{{*/
                                                                        /*}}}*/
 void pkgSourceList::AddVolatileFile(pkgIndexFile * const File)         /*{{{*/
 {
                                                                        /*}}}*/
 void pkgSourceList::AddVolatileFile(pkgIndexFile * const File)         /*{{{*/
 {

-   if (File != NULL)
+   if (File != nullptr)

       VolatileFiles.push_back(File);
 }
                                                                        /*}}}*/
       VolatileFiles.push_back(File);
 }
                                                                        /*}}}*/

+bool pkgSourceList::AddVolatileFile(std::string const &File, std::vector<std::string> * const VolatileCmdL)/*{{{*/
+{
+   // Note: FileExists matches directories and links, too!
+   if (File.empty() || FileExists(File) == false)
+      return false;
+
+   std::string const ext = flExtension(File);
+   if (ext == "deb")
+      AddVolatileFile(new debDebPkgFileIndex(File));
+   else if (ext == "dsc")
+      AddVolatileFile(new debDscFileIndex(File));
+   else if (FileExists(flCombine(File, "debian/control")))
+      AddVolatileFile(new debDscFileIndex(flCombine(File, "debian/control")));
+   else if (ext == "changes")
+   {
+      debDscRecordParser changes(File, nullptr);
+      std::vector<pkgSrcRecords::File2> fileslst;
+      if (changes.Files2(fileslst) == false || fileslst.empty())
+        return false;
+      auto const basedir = flNotFile(File);
+      for (auto && file: fileslst)
+      {
+        auto const name = flCombine(basedir, file.Path);
+        AddVolatileFile(name, VolatileCmdL);
+        if (file.Hashes.VerifyFile(name) == false)
+           return _error->Error("The file %s does not match with the hashes in the %s file!", name.c_str(), File.c_str());
+      }
+      return true;
+   }
+   else
+      return false;
+
+   if (VolatileCmdL != nullptr)
+      VolatileCmdL->push_back(File);
+   return true;
+}
+bool pkgSourceList::AddVolatileFile(std::string const &File)
+{
+   return AddVolatileFile(File, nullptr);
+}
+                                                                       /*}}}*/
+void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector<std::string> * const VolatileCmdL)/*{{{*/
+{
+   std::remove_if(CmdL.FileList + 1, CmdL.FileList + 1 + CmdL.FileSize(), [&](char const * const I) {
+      if (I != nullptr && (I[0] == '/' || (I[0] == '.' && ((I[1] == '.' && I[2] == '/') || I[1] == '/'))))
+      {
+        if (AddVolatileFile(I, VolatileCmdL))
+           ;
+        else
+           _error->Error(_("Unsupported file %s given on commandline"), I);
+        return true;
+      }
+      return false;
+   });
+}
+void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector<const char*> * const VolatileCmdL)
+{
+   std::remove_if(CmdL.FileList + 1, CmdL.FileList + 1 + CmdL.FileSize(), [&](char const * const I) {
+      if (I != nullptr && (I[0] == '/' || (I[0] == '.' && ((I[1] == '.' && I[2] == '/') || I[1] == '/'))))
+      {
+        if (AddVolatileFile(I))
+        {
+           if (VolatileCmdL != nullptr)
+              VolatileCmdL->push_back(I);
+        }
+        else
+           _error->Error(_("Unsupported file %s given on commandline"), I);
+        return true;
+      }
+      return false;
+   });
+}
+                                                                       /*}}}*/