add messages to our deprecation warnings in libapt

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

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index d3599b35369bf09679e58b4a464c217a5f558f7f..708b40a964e52d65db0fcd5e46d6f84ad5dab6f5 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <iostream>
 #include <string>
 #include <stdio.h>
 #include <iostream>
 #include <string>

+#include <sstream>

 
 #include <sys/stat.h>
                                                                        /*}}}*/
 
 #include <sys/stat.h>
                                                                        /*}}}*/


@@ -144,6 +145,17 @@ uint8_t debStatusIndex::GetIndexFlags() const
 {
    return pkgCache::Flag::NotSource;
 }
 {
    return pkgCache::Flag::NotSource;
 }

+
+pkgCacheListParser * debStatusIndex::CreateListParser(FileFd &Pkg)
+{
+   if (Pkg.IsOpen() == false)
+      return NULL;
+   _error->PushToStack();
+   pkgCacheListParser * const Parser = new debStatusListParser(&Pkg);
+   bool const newError = _error->PendingError();
+   _error->MergeWithStack();
+   return newError ? NULL : Parser;
+}

                                                                        /*}}}*/
 // DebPkgFile Index - a single .deb file as an index                   /*{{{*/
 debDebPkgFileIndex::debDebPkgFileIndex(std::string const &DebFile)
                                                                        /*}}}*/
 // DebPkgFile Index - a single .deb file as an index                   /*{{{*/
 debDebPkgFileIndex::debDebPkgFileIndex(std::string const &DebFile)


@@ -169,6 +181,9 @@ bool debDebPkgFileIndex::GetContent(std::ostream &content, std::string const &de
    if(Popen((const char**)&Args[0], PipeFd, Child, FileFd::ReadOnly) == false)
       return _error->Error("Popen failed");
 
    if(Popen((const char**)&Args[0], PipeFd, Child, FileFd::ReadOnly) == false)
       return _error->Error("Popen failed");
 

+   content << "Filename: " << debfile << "\n";
+   content << "Size: " << Buf.st_size << "\n";
+   bool first_line_seen = false;

    char buffer[1024];
    do {
       unsigned long long actual = 0;
    char buffer[1024];
    do {
       unsigned long long actual = 0;


@@ -177,13 +192,19 @@ bool debDebPkgFileIndex::GetContent(std::ostream &content, std::string const &de
       if (actual == 0)
         break;
       buffer[actual] = '\0';
       if (actual == 0)
         break;
       buffer[actual] = '\0';

-      content << buffer;
+      char const * b = buffer;
+      if (first_line_seen == false)
+      {
+        for (; *b != '\0' && (*b == '\n' || *b == '\r'); ++b)
+           /* skip over leading newlines */;
+        if (*b == '\0')
+           continue;
+        first_line_seen = true;
+      }
+      content << b;

    } while(true);
    ExecWait(Child, "Popen");
 
    } while(true);
    ExecWait(Child, "Popen");
 

-   content << "Filename: " << debfile << "\n";
-   content << "Size: " << Buf.st_size << "\n";
-

    return true;
 }
 bool debDebPkgFileIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)
    return true;
 }
 bool debDebPkgFileIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)


@@ -237,7 +258,14 @@ pkgCache::PkgFileIterator debDebPkgFileIndex::FindInCache(pkgCache &Cache) const
 
    return File;
 }
 
    return File;
 }

-
+std::string debDebPkgFileIndex::ArchiveInfo_impl(pkgCache::VerIterator const &Ver) const
+{
+   std::string Res = IndexFileName() + " ";
+   Res.append(Ver.ParentPkg().Name()).append(" ");
+   Res.append(Ver.Arch()).append(" ");
+   Res.append(Ver.VerStr());
+   return Res;
+}

                                                                        /*}}}*/
 // DscFile Index - a single .dsc file as an index                      /*{{{*/
 debDscFileIndex::debDscFileIndex(std::string const &DscFile)
                                                                        /*}}}*/
 // DscFile Index - a single .dsc file as an index                      /*{{{*/
 debDscFileIndex::debDscFileIndex(std::string const &DscFile)