Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

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

diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index bcfdb10176397fa0e1c910c6dff9d76d61b97b26..c6fd528da1b54ef3f04b76b07a91b16189707a2a 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -11,45 +11,55 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

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

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

-#include <apt-pkg/strutl.h>
+#include <apt-pkg/edsplistparser.h>

 #include <apt-pkg/md5.h>
 #include <apt-pkg/md5.h>

-#include <apt-pkg/macros.h>
+#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
+
+#include <array>
+

                                                                        /*}}}*/
 
 // ListParser::edspListParser - Constructor                            /*{{{*/
                                                                        /*}}}*/
 
 // ListParser::edspListParser - Constructor                            /*{{{*/

-edspListParser::edspListParser(FileFd *File, std::string const &Arch) : debListParser(File, Arch)
-{}
+edspLikeListParser::edspLikeListParser(FileFd * const File) : debListParser(File)
+{
+}
+edspListParser::edspListParser(FileFd * const File) : edspLikeListParser(File)
+{
+   std::string const states = _config->FindFile("Dir::State::extended_states");
+   RemoveFile("edspListParserPrivate", states);
+   extendedstates.Open(states, FileFd::WriteOnly | FileFd::Create | FileFd::Exclusive, 0600);
+   std::string const prefs = _config->FindFile("Dir::Etc::preferences");
+   RemoveFile("edspListParserPrivate", prefs);
+   preferences.Open(prefs, FileFd::WriteOnly | FileFd::Create | FileFd::Exclusive, 0600);
+}

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

-bool edspListParser::NewVersion(pkgCache::VerIterator &Ver)
+bool edspLikeListParser::NewVersion(pkgCache::VerIterator &Ver)

 {
 {

-   Ver->ID = Section.FindI("APT-ID", Ver->ID);
+   _system->SetVersionMapping(Ver->ID, Section.FindI("APT-ID", Ver->ID));

    return debListParser::NewVersion(Ver);
 }
                                                                        /*}}}*/
 // ListParser::Description - Return the description string             /*{{{*/
 // ---------------------------------------------------------------------
 /* Sorry, no description for the resolvers… */
    return debListParser::NewVersion(Ver);
 }
                                                                        /*}}}*/
 // ListParser::Description - Return the description string             /*{{{*/
 // ---------------------------------------------------------------------
 /* Sorry, no description for the resolvers… */

-std::string edspListParser::Description()
-{
-   return "";
-}
-std::string edspListParser::DescriptionLanguage()
+std::vector<std::string> edspLikeListParser::AvailableDescriptionLanguages()

 {
 {

-   return "";
+   return {};

 }
 }

-MD5SumValue edspListParser::Description_md5()
+MD5SumValue edspLikeListParser::Description_md5()

 {
    return MD5SumValue("");
 }
                                                                        /*}}}*/
 // ListParser::VersionHash - Compute a unique hash for this version    /*{{{*/
 {
    return MD5SumValue("");
 }
                                                                        /*}}}*/
 // ListParser::VersionHash - Compute a unique hash for this version    /*{{{*/

-// ---------------------------------------------------------------------
-/* */
-unsigned short edspListParser::VersionHash()
+unsigned short edspLikeListParser::VersionHash()

 {
    if (Section.Exists("APT-Hash") == true)
       return Section.FindI("APT-Hash");
 {
    if (Section.Exists("APT-Hash") == true)
       return Section.FindI("APT-Hash");


@@ -58,6 +68,13 @@ unsigned short edspListParser::VersionHash()
    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

+// ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
+APT_CONST bool edspLikeListParser::LoadReleaseInfo(pkgCache::RlsFileIterator & /*FileI*/,
+                                   FileFd & /*File*/, std::string const &/*component*/)
+{
+   return true;
+}
+                                                                       /*}}}*/

 // ListParser::ParseStatus - Parse the status field                    /*{{{*/
 // ---------------------------------------------------------------------
 /* The Status: line here is not a normal dpkg one but just one which tells
 // ListParser::ParseStatus - Parse the status field                    /*{{{*/
 // ---------------------------------------------------------------------
 /* The Status: line here is not a normal dpkg one but just one which tells


@@ -80,13 +97,89 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
       Pkg->CurrentVer = Ver.Index();
    }
 
       Pkg->CurrentVer = Ver.Index();
    }
 

+   if (Section.FindB("APT-Automatic", false))
+   {
+      std::string out;
+      strprintf(out, "Package: %s\nArchitecture: %s\nAuto-Installed: 1\n\n", Pkg.Name(), Pkg.Arch());
+      if (extendedstates.Write(out.c_str(), out.length()) == false)
+        return false;
+   }
+
+   // FIXME: Using an overriding pin is wrong.
+   if (Section.FindB("APT-Candidate", false))
+   {
+      std::string out;
+      strprintf(out, "Package: %s\nPin: version %s\nPin-Priority: 9999\n\n", Pkg.FullName().c_str(), Ver.VerStr());
+      if (preferences.Write(out.c_str(), out.length()) == false)
+        return false;
+   }
+
+   signed short const pinvalue = Section.FindI("APT-Pin", 500);
+   if (pinvalue != 500)
+   {
+      std::string out;
+      strprintf(out, "Package: %s\nPin: version %s\nPin-Priority: %d\n\n", Pkg.FullName().c_str(), Ver.VerStr(), pinvalue);
+      if (preferences.Write(out.c_str(), out.length()) == false)
+        return false;
+   }
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
-bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
-                                   FileFd &File, std::string component)
+
+// ListParser::eippListParser - Constructor                            /*{{{*/
+eippListParser::eippListParser(FileFd *File) : edspLikeListParser(File)

 {
 {

+}
+                                                                       /*}}}*/
+// ListParser::ParseStatus - Parse the status field                    /*{{{*/
+// ---------------------------------------------------------------------
+/* The Status: line here is not a normal dpkg one but just one which tells
+   use if the package is installed or not, where missing means not. */
+bool eippListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
+                               pkgCache::VerIterator &Ver)
+{
+   // Process the flag field
+   static std::array<WordList, 8> const statusvalues = {{
+      {"not-installed",pkgCache::State::NotInstalled},
+      {"config-files",pkgCache::State::ConfigFiles},
+      {"half-installed",pkgCache::State::HalfInstalled},
+      {"unpacked",pkgCache::State::UnPacked},
+      {"half-configured",pkgCache::State::HalfConfigured},
+      {"triggers-awaited",pkgCache::State::TriggersAwaited},
+      {"triggers-pending",pkgCache::State::TriggersPending},
+      {"installed",pkgCache::State::Installed},
+   }};
+   auto const status = Section.Find("Status");
+   if (status.empty() == false)
+   {
+      for (auto && sv: statusvalues)
+      {
+        if (status != sv.Str)
+           continue;
+        Pkg->CurrentState = sv.Val;
+        switch (Pkg->CurrentState)
+        {
+           case pkgCache::State::NotInstalled:
+           case pkgCache::State::ConfigFiles:
+              break;
+           case pkgCache::State::HalfInstalled:
+           case pkgCache::State::UnPacked:
+           case pkgCache::State::HalfConfigured:
+           case pkgCache::State::TriggersAwaited:
+           case pkgCache::State::TriggersPending:
+           case pkgCache::State::Installed:
+              Pkg->CurrentVer = Ver.Index();
+              break;
+        }
+        break;
+      }
+   }
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+edspLikeListParser::~edspLikeListParser() {}
+edspListParser::~edspListParser() {}
+eippListParser::~eippListParser() {}