diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:57:35 +0200 |
| commit | b53c9cea2902572822bbbece5bac236c1bbf846e (patch) | |
| tree | 6c6b0524e0971c0623ccbff71383523ee0b2a5cc /apt-pkg/edsp/edspsystem.cc | |
| parent | 21248c0f00ee71412dbadc6ebf84011cf974346d (diff) | |
| parent | 2a22cd60f04c4291ea9b9b72e15b6d2ec378b001 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records
Diffstat (limited to 'apt-pkg/edsp/edspsystem.cc')
| -rw-r--r-- | apt-pkg/edsp/edspsystem.cc | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc index 063517421..f577efcbd 100644 --- a/apt-pkg/edsp/edspsystem.cc +++ b/apt-pkg/edsp/edspsystem.cc @@ -15,7 +15,6 @@ #include <apt-pkg/debversion.h> #include <apt-pkg/edspindexfile.h> #include <apt-pkg/edspsystem.h> -#include <apt-pkg/fileutl.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/cacheiterators.h> @@ -23,16 +22,11 @@ #include <string> #include <vector> -#include <apti18n.h> /*}}}*/ -// System::debSystem - Constructor /*{{{*/ -edspSystem::edspSystem() +// System::edspSystem - Constructor /*{{{*/ +edspSystem::edspSystem() : pkgSystem("Debian APT solver interface", &debVS), d(NULL), StatusFile(NULL) { - StatusFile = 0; - - Label = "Debian APT solver interface"; - VS = &debVS; } /*}}}*/ // System::~debSystem - Destructor /*{{{*/ @@ -85,18 +79,13 @@ bool edspSystem::ArchiveSupported(const char * /*Type*/) return false; } /*}}}*/ -// System::Score - Determine if we should use the edsp system /*{{{*/ -signed edspSystem::Score(Configuration const &Cnf) +// System::Score - Never use the EDSP system automatically /*{{{*/ +signed edspSystem::Score(Configuration const &) { - 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 /*{{{*/ -bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List) +bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List) /*{{{*/ { if (StatusFile == 0) { |