X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/24e8f24e1e94ec3816b0bfc7a05d1c4e3f73248e..d4cfc24887851fa55f93a1a3c09f662b80f97729:/apt-pkg/sourcelist.cc

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 2100b5d3c..82d2ed3c6 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -11,6 +11,7 @@
 #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>
@@ -20,6 +21,7 @@
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/debindexfile.h>
 
 #include <ctype.h>
 #include <stddef.h>
@@ -416,16 +418,16 @@ bool pkgSourceList::ParseFileOldStyle(std::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);
-   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
+   pkgTagSection Tags;
    while (Sources.Step(Tags) == true)
    {
       if(Tags.Exists("Types") == false)
@@ -536,7 +538,44 @@ std::vector<pkgIndexFile*> pkgSourceList::GetVolatileFiles() const	/*{{{*/
 									/*}}}*/
 void pkgSourceList::AddVolatileFile(pkgIndexFile * const File)		/*{{{*/
 {
-   if (File != NULL)
+   if (File != nullptr)
       VolatileFiles.push_back(File);
 }
 									/*}}}*/
+bool pkgSourceList::AddVolatileFile(std::string const &File)		/*{{{*/
+{
+   // 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
+      return false;
+
+   return true;
+}
+									/*}}}*/
+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;
+   });
+}
+									/*}}}*/