merged lp:~mvo/apt/mvo

[ntk/apt.git] / apt-pkg / edsp / edspsystem.cc

diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 3a0494e..aae969d 100644 (file)
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -9,17 +9,20 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
+#include <config.h>
+
 #include <apt-pkg/edspsystem.h>
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/edspindexfile.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apti18n.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
+
+#include <apti18n.h>
                                                                        /*}}}*/
 
 edspSystem edspSys;
@@ -86,22 +89,22 @@ bool edspSystem::ArchiveSupported(const char *Type)
 // System::Score - Determine if we should use the edsp system          /*{{{*/
 signed edspSystem::Score(Configuration const &Cnf)
 {
-   if (Cnf.Find("Dir::State::edsp::scenario", "") == "stdin")
+   if (Cnf.Find("edsp::scenario", "") == "stdin")
       return 1000;
-   if (FileExists(Cnf.FindFile("Dir::State::edsp::scenario","")) == true)
+   if (RealFileExists(Cnf.FindFile("edsp::scenario","")) == true)
       return 1000;
    return -1000;
 }
                                                                        /*}}}*/
 // System::AddStatusFiles - Register the status files                  /*{{{*/
-bool edspSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
+bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)
 {
    if (StatusFile == 0)
    {
-      if (_config->Find("Dir::State::edsp::scenario", "") == "stdin")
+      if (_config->Find("edsp::scenario", "") == "stdin")
         StatusFile = new edspIndex("stdin");
       else
-        StatusFile = new edspIndex(_config->FindFile("Dir::State::edsp::scenario"));
+        StatusFile = new edspIndex(_config->FindFile("edsp::scenario"));
    }
    List.push_back(StatusFile);
    return true;