merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 579ffc65616ea75fe0b6df21f3b3a29555e0b1e9..aae969d9d546cfd6bdd274381bda28681e44f693 100644 (file)
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -2,24 +2,27 @@
 // Description                                                         /*{{{*/
 /* ######################################################################
 
 // Description                                                         /*{{{*/
 /* ######################################################################
 

-   This system provides the abstraction to use the universe file as the
+   This system provides the abstraction to use the scenario file as the

    only source of package information to be able to feed the created file
    back to APT for its own consumption (eat your own dogfood).
 
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    only source of package information to be able to feed the created file
    back to APT for its own consumption (eat your own dogfood).
 
    ##################################################################### */
                                                                        /*}}}*/
 // 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 <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 <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 edspSystem edspSys;
                                                                        /*}}}*/
 
 edspSystem edspSys;


@@ -86,16 +89,23 @@ bool edspSystem::ArchiveSupported(const char *Type)
 // System::Score - Determine if we should use the edsp system          /*{{{*/
 signed edspSystem::Score(Configuration const &Cnf)
 {
 // System::Score - Determine if we should use the edsp system          /*{{{*/
 signed edspSystem::Score(Configuration const &Cnf)
 {

-   if (FileExists(Cnf.FindFile("Dir::State::universe","")) == true)
-       return 1000;
+   if (Cnf.Find("edsp::scenario", "") == "stdin")
+      return 1000;
+   if (RealFileExists(Cnf.FindFile("edsp::scenario","")) == true)
+      return 1000;

    return -1000;
 }
                                                                        /*}}}*/
 // System::AddStatusFiles - Register the status files                  /*{{{*/
    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 (StatusFile == 0)

-      StatusFile = new edspIndex(_config->FindFile("Dir::State::universe"));
+   {
+      if (_config->Find("edsp::scenario", "") == "stdin")
+        StatusFile = new edspIndex("stdin");
+      else
+        StatusFile = new edspIndex(_config->FindFile("edsp::scenario"));
+   }

    List.push_back(StatusFile);
    return true;
 }
    List.push_back(StatusFile);
    return true;
 }