fix test-failure in adt

[apt.git] / cmdline / apt.cc

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 170478174ad365652526c60db5a96c0ae7172a32..4813861a441a61d88cc8c93758a535d2fc07a8e8 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -11,39 +11,12 @@
 // Include Files                                                       /*{{{*/
 #include<config.h>
 
 // Include Files                                                       /*{{{*/
 #include<config.h>
 

-#include <cassert>
-#include <locale.h>
-#include <iostream>
-#include <unistd.h>
-#include <errno.h>
-#include <regex.h>
-#include <stdio.h>
-#include <iomanip>
-#include <algorithm>
-
-
+#include <apt-pkg/cmndline.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheset.h>

 #include <apt-pkg/init.h>
 #include <apt-pkg/init.h>

-#include <apt-pkg/progress.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/srcrecords.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/policy.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/algorithms.h>
-#include <apt-pkg/sptr.h>

 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/pkgsystem.h>

-#include <apt-pkg/indexfile.h>
-#include <apt-pkg/metaindex.h>
-#include <apt-pkg/hashes.h>
-
-#include <apti18n.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>

 
 #include <apt-private/private-list.h>
 #include <apt-private/private-search.h>
 
 #include <apt-private/private-list.h>
 #include <apt-private/private-search.h>


@@ -55,13 +28,16 @@
 #include <apt-private/private-upgrade.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
 #include <apt-private/private-upgrade.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>

-#include <apt-private/private-utils.h>

 #include <apt-private/private-sources.h>
 #include <apt-private/private-sources.h>

-                                                                       /*}}}*/

 
 

+#include <unistd.h>
+#include <iostream>
+#include <vector>

 
 

+#include <apti18n.h>
+                                                                       /*}}}*/

 
 

-bool ShowHelp(CommandLine &CmdL)
+static bool ShowHelp(CommandLine &)

 {
    ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);
 {
    ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
            COMMON_ARCH,__DATE__,__TIME__);


@@ -71,18 +47,20 @@ bool ShowHelp(CommandLine &CmdL)
     _("Usage: apt [options] command\n"
       "\n"
       "CLI for apt.\n"
     _("Usage: apt [options] command\n"
       "\n"
       "CLI for apt.\n"

-      "Commands: \n"
+      "Basic commands: \n"

       " list - list packages based on package names\n"
       " search - search in package descriptions\n"
       " show - show package details\n"
       "\n"
       " list - list packages based on package names\n"
       " search - search in package descriptions\n"
       " show - show package details\n"
       "\n"

+      " update - update list of available packages\n"
+      "\n"

       " install - install packages\n"
       " install - install packages\n"

-      " remove - remove packages\n"
+      " remove  - remove packages\n"

       "\n"
       "\n"

-      " edit-sources - edit the source information file\n"
+      " upgrade - upgrade the system by installing/upgrading packages\n"
+      " full-upgrade - upgrade the system by removing/installing/upgrading packages\n"

       "\n"
       "\n"

-      " update - update list of available packages\n"
-      " upgrade - upgrade the systems packages\n"
+      " edit-sources - edit the source information file\n"

        );
    
    return true;
        );
    
    return true;


@@ -90,16 +68,27 @@ bool ShowHelp(CommandLine &CmdL)
 
 int main(int argc, const char *argv[])                                 /*{{{*/
 {
 
 int main(int argc, const char *argv[])                                 /*{{{*/
 {

-   CommandLine::Dispatch Cmds[] = {{"list",&List},
+   CommandLine::Dispatch Cmds[] = {
+                                   // query
+                                   {"list",&DoList},

                                    {"search", &FullTextSearch},
                                    {"show", &APT::Cmd::ShowPackage},
                                    {"search", &FullTextSearch},
                                    {"show", &APT::Cmd::ShowPackage},

-                                   // needs root
+
+                                   // package stuff

                                    {"install",&DoInstall},
                                    {"remove", &DoInstall},
                                    {"install",&DoInstall},
                                    {"remove", &DoInstall},

+                                   {"purge", &DoInstall},
+
+                                   // system wide stuff

                                    {"update",&DoUpdate},
                                    {"update",&DoUpdate},

-                                   {"upgrade",&DoUpgradeWithAllowNewPackages},
+                                   {"upgrade",&DoUpgrade},
+                                   {"full-upgrade",&DoDistUpgrade},
+                                   // for compat with muscle memory
+                                   {"dist-upgrade",&DoDistUpgrade},
+

                                    // misc
                                    {"edit-sources",&EditSources},
                                    // misc
                                    {"edit-sources",&EditSources},

+

                                    // helper
                                    {"moo",&DoMoo},
                                    {"help",&ShowHelp},
                                    // helper
                                    {"moo",&DoMoo},
                                    {"help",&ShowHelp},


@@ -107,17 +96,6 @@ int main(int argc, const char *argv[])                                      /*{{{*/
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
 
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
 

-   if(!isatty(1)) 
-   {
-      std::cerr << std::endl
-                << "WARNING WARNING "
-                << argv[0]
-                << " is *NOT* intended for scripts "
-                << "use at your own peril^Wrisk"
-                << std::endl
-                << std::endl;
-   }
-

    InitOutput();
 
    // Set up gettext support
    InitOutput();
 
    // Set up gettext support


@@ -130,9 +108,10 @@ int main(int argc, const char *argv[])                                     /*{{{*/
         return 100;
     }
 
         return 100;
     }
 

-   // FIXME: move into a new libprivate/private-install.cc:Install()
-   _config->Set("DPkgPM::Progress-Fancy", "1");
-   _config->Set("Apt::Color", "1");
+    // some different defaults
+   _config->CndSet("DPkg::Progress-Fancy", "1");
+   _config->CndSet("Apt::Color", "1");
+   _config->CndSet("APT::Get::Upgrade-Allow-New", true);

 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args.data(), _config);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args.data(), _config);


@@ -143,6 +122,17 @@ int main(int argc, const char *argv[])                                     /*{{{*/
       return 100;
    }
 
       return 100;
    }
 

+   if(!isatty(STDOUT_FILENO) && 
+      _config->FindB("Apt::Cmd::Disable-Script-Warning", false) == false)
+   {
+      std::cerr << std::endl
+                << "WARNING: " << argv[0] << " "
+                << "does not have a stable CLI interface yet. "
+                << "Use with caution in scripts."
+                << std::endl
+                << std::endl;
+   }
+

    // See if the help should be shown
    if (_config->FindB("help") == true ||
        _config->FindB("version") == true ||
    // See if the help should be shown
    if (_config->FindB("help") == true ||
        _config->FindB("version") == true ||