Merge branch 'debian/sid' into feature/more-fancy-progress

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

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 25ecb7af1d0773c13fb5bed21c4ef7367b192fb0..b85c07c33345bcb3541e425eadcedae4db849154 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -7,6 +7,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
@@ -17,34 +19,40 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>
-
-#include <config.h>
-#include <apti18n.h>
-
+#include <apt-pkg/upgrade.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <string.h>
+#include <iostream>
+#include <list>
+#include <string>
 #include <unistd.h>
 #include <cstdio>
+
+#include <apti18n.h>
                                                                        /*}}}*/
 
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowHelp(CommandLine &CmdL) {
+static bool ShowHelp(CommandLine &) {
        ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
                 COMMON_ARCH,__DATE__,__TIME__);
 
        std::cout <<
-               _("Usage: apt-internal-resolver\n"
+               _("Usage: apt-internal-solver\n"
                "\n"
-               "apt-internal-resolver is an interface to use the current internal\n"
+               "apt-internal-solver is an interface to use the current internal\n"
                "like an external resolver for the APT family for debugging or alike\n"
                "\n"
                "Options:\n"
                "  -h  This help text.\n"
                "  -q  Loggable output - no progress indicator\n"
                "  -c=? Read this configuration file\n"
-               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-               "apt.conf(5) manual pages for more information and options.\n"
-               "                       This APT has Super Cow Powers.\n");
+               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
        return true;
 }
                                                                        /*}}}*/
@@ -160,16 +168,16 @@ int main(int argc,const char *argv[])                                     /*{{{*/
 
        if (upgrade == true) {
                if (pkgAllUpgrade(CacheFile) == false) {
-                       EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occured", output);
+                       EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occurred", output);
                        return 0;
                }
        } else if (distUpgrade == true) {
                if (pkgDistUpgrade(CacheFile) == false) {
-                       EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occured", output);
+                       EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occurred", output);
                        return 0;
                }
        } else if (Fix.Resolve() == false) {
-               EDSP::WriteError("ERR_UNSOLVABLE", "An error occured", output);
+               EDSP::WriteError("ERR_UNSOLVABLE", "An error occurred", output);
                return 0;
        }