* COPYING:

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3f9a5b24885198658734ba15738ee8eac15b45db..a7221d47dd576c6568da3a89c40674f3d39f517a 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1374,8 +1374,9 @@ bool DoUpdate(CommandLine &CmdL)
 
    // do the work
    CacheFile Cache;
-   bool res = ListUpdate(Stat, List);
-     
+   if (_config->FindB("APT::Get::Download",true) == true)
+       ListUpdate(Stat, List);
+
    // Rebuild the cache.   
    if (Cache.BuildCaches() == false)
       return false;
@@ -1720,6 +1721,7 @@ bool DoInstall(CommandLine &CmdL)
              "requested an impossible situation or if you are using the unstable\n" 
              "distribution that some required packages have not yet been created\n"
              "or been moved out of Incoming.") << endl;
+        /*
         if (Packages == 1)
         {
            c1out << endl;
@@ -1728,6 +1730,7 @@ bool DoInstall(CommandLine &CmdL)
                 "the package is simply not installable and a bug report against\n" 
                 "that package should be filed.") << endl;
         }
+        */
 
         c1out << _("The following information may help to resolve the situation:") << endl;
         c1out << endl;
@@ -2512,6 +2515,8 @@ bool DoBuildDep(CommandLine &CmdL)
             {
                // We successfully installed something; skip remaining alternatives
                skipAlternatives = hasAlternatives;
+              if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true)
+                 Cache->MarkAuto(Pkg, true);
                continue;
             }
             else if (hasAlternatives)
@@ -2626,7 +2631,7 @@ bool ShowHelp(CommandLine &CmdL)
       "   upgrade - Perform an upgrade\n"
       "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
       "   remove - Remove packages\n"
-      "   autoremove - Remove all automatic unused packages\n"
+      "   autoremove - Remove automatically all unused packages\n"
       "   purge - Remove and purge packages\n"
       "   source - Download source archives\n"
       "   build-dep - Configure build-dependencies for source packages\n"