test Release file handling with expired keys

[apt.git] / apt-pkg / edsp / edsplistparser.cc

diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 913455efa1b6aede40f71290ed807a5246315683..bcfdb10176397fa0e1c910c6dff9d76d61b97b26 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -9,6 +9,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>


@@ -18,7 +20,7 @@
                                                                        /*}}}*/
 
 // ListParser::edspListParser - Constructor                            /*{{{*/
                                                                        /*}}}*/
 
 // ListParser::edspListParser - Constructor                            /*{{{*/

-edspListParser::edspListParser(FileFd *File, string const &Arch) : debListParser(File, Arch)
+edspListParser::edspListParser(FileFd *File, std::string const &Arch) : debListParser(File, Arch)

 {}
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/
 {}
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/


@@ -31,11 +33,11 @@ bool edspListParser::NewVersion(pkgCache::VerIterator &Ver)
 // ListParser::Description - Return the description string             /*{{{*/
 // ---------------------------------------------------------------------
 /* Sorry, no description for the resolvers… */
 // ListParser::Description - Return the description string             /*{{{*/
 // ---------------------------------------------------------------------
 /* Sorry, no description for the resolvers… */

-string edspListParser::Description()
+std::string edspListParser::Description()

 {
    return "";
 }
 {
    return "";
 }

-string edspListParser::DescriptionLanguage()
+std::string edspListParser::DescriptionLanguage()

 {
    return "";
 }
 {
    return "";
 }


@@ -63,10 +65,13 @@ unsigned short edspListParser::VersionHash()
 bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                                pkgCache::VerIterator &Ver)
 {
 bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                                pkgCache::VerIterator &Ver)
 {

-   if (Section.FindFlag("Hold",Pkg->Flags,pkgCache::State::Installed) == false)
+   unsigned long state = 0;
+   if (Section.FindFlag("Hold",state,pkgCache::State::Hold) == false)

       return false;
       return false;

+   if (state != 0)
+      Pkg->SelectedState = pkgCache::State::Hold;

 
 

-   unsigned long state = 0;
+   state = 0;

    if (Section.FindFlag("Installed",state,pkgCache::State::Installed) == false)
       return false;
    if (state != 0)
    if (Section.FindFlag("Installed",state,pkgCache::State::Installed) == false)
       return false;
    if (state != 0)


@@ -80,7 +85,7 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                                                                        /*}}}*/
 // ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
 bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
                                                                        /*}}}*/
 // ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
 bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,

-                                   FileFd &File, string component)
+                                   FileFd &File, std::string component)

 {
    return true;
 }
 {
    return true;
 }