[ David Kalnischkies ]

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index fcd9bb9018f3f9d9fd42d75be973aa46a6b73b8f..749305005f46730ccdfbb110312a4890e585ce69 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -14,6 +14,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/aptconfiguration.h>
 
 using std::max;
                                                                        /*}}}*/
@@ -54,7 +55,8 @@ const char **debSrcRecordParser::Binaries()
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */
-bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly)
+bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps,
+                                       bool const &ArchOnly, bool const &StripMultiArch)
 {
    unsigned int I;
    const char *Start, *Stop;
@@ -77,7 +79,7 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec>
       while (1)
       {
          Start = debListParser::ParseDepends(Start, Stop, 
-                    rec.Package,rec.Version,rec.Op,true);
+                    rec.Package,rec.Version,rec.Op,true, StripMultiArch);
         
          if (Start == 0) 
             return _error->Error("Problem parsing dependency: %s", fields[I]);
@@ -110,7 +112,9 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
    string Base = Sect.FindS("Directory");
    if (Base.empty() == false && Base[Base.length()-1] != '/')
       Base += '/';
-   
+
+   std::vector<std::string> const compExts = APT::Configuration::getCompressorExtensions();
+
    // Iterate over the entire list grabbing each triplet
    const char *C = Files.c_str();
    while (*C != 0)
@@ -135,9 +139,16 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
         string::size_type Tmp = F.Path.rfind('.',Pos);
         if (Tmp == string::npos)
            break;
+        if (F.Type == "tar") {
+           // source v3 has extension 'debian.tar.*' instead of 'diff.*'
+           if (string(F.Path, Tmp+1, Pos-Tmp) == "debian")
+              F.Type = "diff";
+           break;
+        }
         F.Type = string(F.Path,Tmp+1,Pos-Tmp);
         
-        if (F.Type == "gz" || F.Type == "bz2")
+        if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() ||
+            F.Type == "tar")
         {
            Pos = Tmp-1;
            continue;
@@ -152,3 +163,11 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
    return true;
 }
                                                                        /*}}}*/
+// SrcRecordParser::~SrcRecordParser - Destructor                      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+debSrcRecordParser::~debSrcRecordParser()
+{
+   delete[] Buffer;
+}
+                                                                       /*}}}*/