rename the 'universe' to 'scenario' to reflect the naming in the draft

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 35752a5..b55ff28 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -742,8 +742,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
    std::string const solver = _config->Find("APT::Solver::Name", "internal");
    if (solver != "internal")
    {
-      FILE* output = fopen("/tmp/universe.log", "w");
-      edspWriter::WriteUniverse(Cache, output);
+      FILE* output = fopen("/tmp/scenario.log", "w");
+      edspWriter::WriteScenario(Cache, output);
       fclose(output);
       output = fopen("/tmp/request.log", "w");
       edspWriter::WriteRequest(Cache, output);

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 366325d..f5881e6 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -1,7 +1,7 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 /* ######################################################################
-   The universe file is designed to work as an intermediate file between
+   The scenario file is designed to work as an intermediate file between
    APT and the resolver. Its on propose very similar to a dpkg status file
    ##################################################################### */
                                                                        /*}}}*/
@@ -51,7 +51,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
       return _error->Errno("fstat","Failed to stat");
    CFile->Size = St.st_size;
    CFile->mtime = St.st_mtime;
-   CFile->Archive = Gen.WriteUniqString("universe");
+   CFile->Archive = Gen.WriteUniqString("edsp::scenario");
 
    if (Gen.MergeList(Parser) == false)
       return _error->Error("Problem with MergeList %s",File.c_str());
@@ -67,7 +67,7 @@ class edspIFType: public pkgIndexFile::Type
       // we don't have a record parser for this type as the file is not presistent
       return NULL;
    };
-   edspIFType() {Label = "APT universe file";};
+   edspIFType() {Label = "EDSP scenario file";};
 };
 static edspIFType _apt_Universe;
 

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 4ef7787..87c0655 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -1,7 +1,7 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 /* ######################################################################
-   The universe file is designed to work as an intermediate file between
+   The scenario file is designed to work as an intermediate file between
    APT and the resolver. Its on propose very similar to a dpkg status file
    ##################################################################### */
                                                                        /*}}}*/

diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index c8e417b..3a0494e 100644 (file)
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -2,7 +2,7 @@
 // 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).
 
@@ -86,9 +86,9 @@ 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::universe", "") == "stdin")
+   if (Cnf.Find("Dir::State::edsp::scenario", "") == "stdin")
       return 1000;
-   if (FileExists(Cnf.FindFile("Dir::State::universe","")) == true)
+   if (FileExists(Cnf.FindFile("Dir::State::edsp::scenario","")) == true)
       return 1000;
    return -1000;
 }
@@ -98,10 +98,10 @@ bool edspSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
 {
    if (StatusFile == 0)
    {
-      if (_config->Find("Dir::State::universe", "") == "stdin")
+      if (_config->Find("Dir::State::edsp::scenario", "") == "stdin")
         StatusFile = new edspIndex("stdin");
       else
-        StatusFile = new edspIndex(_config->FindFile("Dir::State::universe"));
+        StatusFile = new edspIndex(_config->FindFile("Dir::State::edsp::scenario"));
    }
    List.push_back(StatusFile);
    return true;

diff --git a/apt-pkg/edsp/edspwriter.cc b/apt-pkg/edsp/edspwriter.cc
index ea46065..5c741c4 100644 (file)
--- a/apt-pkg/edsp/edspwriter.cc
+++ b/apt-pkg/edsp/edspwriter.cc
@@ -18,7 +18,7 @@
                                                                        /*}}}*/
 
 // edspWriter::WriteUniverse - to the given file descriptor            /*{{{*/
-bool edspWriter::WriteUniverse(pkgDepCache &Cache, FILE* output)
+bool edspWriter::WriteScenario(pkgDepCache &Cache, FILE* output)
 {
    // we could use pkgCache::DepType and ::Priority, but these would be lokalized strings…
    const char * const PrioMap[] = {0, "important", "required", "standard",

diff --git a/apt-pkg/edsp/edspwriter.h b/apt-pkg/edsp/edspwriter.h
index c42dfd3..2b41795 100644 (file)
--- a/apt-pkg/edsp/edspwriter.h
+++ b/apt-pkg/edsp/edspwriter.h
@@ -12,7 +12,7 @@
 class edspWriter                                                               /*{{{*/
 {
 public:
-       bool static WriteUniverse(pkgDepCache &Cache, FILE* output);
+       bool static WriteScenario(pkgDepCache &Cache, FILE* output);
        bool static WriteRequest(pkgDepCache &Cache, FILE* output);
        bool static WriteSolution(pkgDepCache &Cache, FILE* output);
 };