merged from debian-sid

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index df6a6f569142818e50cf0a548ef1973e0199ee78..ef6c688fec74b488603e994b4113f2551ede8a1d 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -97,7 +97,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
        if (_config->FindI("quiet", 0) < 1)
                _config->Set("Debug::EDSP::WriteSolution", true);
 
-       _config->Set("APT::Solver::Name", "internal");
+       _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "stdin");
        int input = STDIN_FILENO;
        FILE* output = stdout;
@@ -158,16 +158,16 @@ int main(int argc,const char *argv[])                                     /*{{{*/
 
        if (upgrade == true) {
                if (pkgAllUpgrade(CacheFile) == false) {
-                       EDSP::WriteError("An upgrade error occured", output);
+                       EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occured", output);
                        return 0;
                }
        } else if (distUpgrade == true) {
                if (pkgDistUpgrade(CacheFile) == false) {
-                       EDSP::WriteError("An dist-upgrade error occured", output);
+                       EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occured", output);
                        return 0;
                }
        } else if (Fix.Resolve() == false) {
-               EDSP::WriteError("An error occured", output);
+               EDSP::WriteError("ERR_UNSOLVABLE", "An error occured", output);
                return 0;
        }