From b195733d0f3476ae92f2689ba5c584a69171f170 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 31 Mar 2011 12:17:39 +0200
Subject: parse the state of the package from the scenario file correctly

---
 apt-pkg/edsp/edsplistparser.cc | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

(limited to 'apt-pkg/edsp')

diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 3e57ea822..913455efa 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -63,40 +63,18 @@ 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;
-
-   // 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)
+   if (Section.FindFlag("Hold",Pkg->Flags,pkgCache::State::Installed) == false)
       return false;
 
-   // Isolate the first word
-   const char *I = Start;
-   for(; I < Stop && *I != ' '; I++);
-
-   // 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");
-
-   /* 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))
+   unsigned long state = 0;
+   if (Section.FindFlag("Installed",state,pkgCache::State::Installed) == false)
+      return false;
+   if (state != 0)
    {
-      if (Ver.end() == true)
-	 _error->Warning("Encountered status field in a non-version description");
-      else
-	 Pkg->CurrentVer = Ver.Index();
+      Pkg->CurrentState = pkgCache::State::Installed;
+      Pkg->CurrentVer = Ver.Index();
    }
-   
+
    return true;
 }
 									/*}}}*/
-- 
cgit v1.2.3