show more details for "Writing more data" errors, too

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

diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 3e57ea822a28221479d3a00b3d0c504afdb262a1..82799205ebfa04558be2a943d6ad3c414a25aa7a 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -9,17 +9,40 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#include <apt-pkg/edsplistparser.h>
-#include <apt-pkg/error.h>
+#include <config.h>
+
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/edsplistparser.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>
+
                                                                        /*}}}*/
 
+class edspListParserPrivate                                            /*{{{*/
+{
+public:
+   FileFd extendedstates;
+   FileFd preferences;
+
+   edspListParserPrivate()
+   {
+      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::edspListParser - Constructor                            /*{{{*/
-edspListParser::edspListParser(FileFd *File, string const &Arch) : debListParser(File, Arch)
-{}
+edspListParser::edspListParser(FileFd *File) : debListParser(File), d(new edspListParserPrivate())
+{
+}
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/
 bool edspListParser::NewVersion(pkgCache::VerIterator &Ver)
@@ -31,13 +54,9 @@ bool edspListParser::NewVersion(pkgCache::VerIterator &Ver)
 // ListParser::Description - Return the description string             /*{{{*/
 // ---------------------------------------------------------------------
 /* Sorry, no description for the resolvers… */
-string edspListParser::Description()
-{
-   return "";
-}
-string edspListParser::DescriptionLanguage()
+std::vector<std::string> edspListParser::AvailableDescriptionLanguages()
 {
-   return "";
+   return {};
 }
 MD5SumValue edspListParser::Description_md5()
 {
@@ -63,47 +82,59 @@ unsigned short edspListParser::VersionHash()
 bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                                pkgCache::VerIterator &Ver)
 {
-   const char *Start;
-   const char *Stop;
-   if (Section.Find("Status",Start,Stop) == false)
-      return true;
+   unsigned long state = 0;
+   if (Section.FindFlag("Hold",state,pkgCache::State::Hold) == false)
+      return false;
+   if (state != 0)
+      Pkg->SelectedState = pkgCache::State::Hold;
 
-   // UsePackage() is responsible for setting the flag in the default case
-   bool const static essential = _config->Find("pkgCacheGen::Essential", "") == "installed";
-   if (essential == true &&
-       Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)
+   state = 0;
+   if (Section.FindFlag("Installed",state,pkgCache::State::Installed) == false)
       return false;
+   if (state != 0)
+   {
+      Pkg->CurrentState = pkgCache::State::Installed;
+      Pkg->CurrentVer = Ver.Index();
+   }
 
-   // Isolate the first word
-   const char *I = Start;
-   for(; I < Stop && *I != ' '; I++);
+   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 (d->extendedstates.Write(out.c_str(), out.length()) == false)
+        return false;
+   }
 
-   // Process the flag field
-   WordList StatusList[] = {{"installed",pkgCache::State::Installed},
-                            {}};
-   if (GrabWord(string(Start,I-Start),StatusList,Pkg->CurrentState) == false)
-      return _error->Error("Malformed Status line");
+   // 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 (d->preferences.Write(out.c_str(), out.length()) == false)
+        return false;
+   }
 
-   /* A Status line marks the package as indicating the current
-      version as well. Only if it is actually installed.. Otherwise
-      the interesting dpkg handling of the status file creates bogus 
-      entries. */
-   if (!(Pkg->CurrentState == pkgCache::State::NotInstalled ||
-        Pkg->CurrentState == pkgCache::State::ConfigFiles))
+   signed short const pinvalue = Section.FindI("APT-Pin", 500);
+   if (pinvalue != 500)
    {
-      if (Ver.end() == true)
-        _error->Warning("Encountered status field in a non-version description");
-      else
-        Pkg->CurrentVer = Ver.Index();
+      std::string out;
+      strprintf(out, "Package: %s\nPin: version %s\nPin-Priority: %d\n\n", Pkg.FullName().c_str(), Ver.VerStr(), pinvalue);
+      if (d->preferences.Write(out.c_str(), out.length()) == false)
+        return false;
    }
-   
+
    return true;
 }
                                                                        /*}}}*/
 // ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
-bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
-                                   FileFd &File, string component)
+APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::RlsFileIterator & /*FileI*/,
+                                   FileFd & /*File*/, std::string const &/*component*/)
 {
    return true;
 }
                                                                        /*}}}*/
+edspListParser::~edspListParser()                                      /*{{{*/
+{
+   delete d;
+}
+                                                                       /*}}}*/