releasing package apt version 0.9.14.3~exp4

[apt.git] / cmdline / apt.cc

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index ef31d002934f162b65a30e47fe7c5c2eb2362028..07ade6b7c77a71efd5f5c040d3f12a24042337f9 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -41,6 +41,7 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.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 <apti18n.h>
 


@@ -55,25 +56,9 @@
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
 #include <apt-private/private-utils.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>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

-// EditSource - EditSourcesList                                        /*{{{*/
-// ---------------------------------------------------------------------
-bool EditSources(CommandLine &CmdL)
-{
-   // FIXME: suport CmdL.FileList to specify sources.list.d files
-
-   std::string sourceslist = _config->FindFile("Dir::Etc::sourcelist");
-
-   // FIXME: take hash before, 
-   //        when changed display message to apt update
-   //        do syntax check after save (like visudo)
-
-   EditFileInSensibleEditor(sourceslist);
-
-   return true;
-}
-                                                                       /*}}}*/

 
 
 bool ShowHelp(CommandLine &CmdL)
 
 
 bool ShowHelp(CommandLine &CmdL)


@@ -86,13 +71,16 @@ 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"
       " update - update list of available packages\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"
+      "\n"

       " upgrade - upgrade the systems packages\n"
       "\n"
       " edit-sources - edit the source information file\n"
       " upgrade - upgrade the systems packages\n"
       "\n"
       " edit-sources - edit the source information file\n"


@@ -101,16 +89,27 @@ bool ShowHelp(CommandLine &CmdL)
    return true;
 }
 
    return true;
 }
 

+// figure out what kind of upgrade the user wants
+bool DoAptUpgrade(CommandLine &CmdL)
+{
+   if (_config->FindB("Apt::Cmd::Dist-Upgrade"))
+      return DoDistUpgrade(CmdL);
+   else
+      return DoUpgradeWithAllowNewPackages(CmdL);
+}
+

 int main(int argc, const char *argv[])                                 /*{{{*/
 {
    CommandLine::Dispatch Cmds[] = {{"list",&List},
                                    {"search", &FullTextSearch},
                                    {"show", &APT::Cmd::ShowPackage},
 int main(int argc, const char *argv[])                                 /*{{{*/
 {
    CommandLine::Dispatch Cmds[] = {{"list",&List},
                                    {"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",&DoAptUpgrade},

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


@@ -120,17 +119,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


@@ -156,6 +144,19 @@ 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;
+   }
+   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
+      _config->Set("quiet","1");
+

    // 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 ||