merge with the debian tree

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ead05313663cce12e78c0a288d13734fbedac0d6..b619a45c57010e80c80092f32e1c2c876850b12d 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1708,7 +1708,8 @@ bool DoInstall(CommandLine &CmdL)
            // where foo is marked automatic
            if(!Remove && 
               Cache[Pkg].Install() == false && 
-              (Cache[Pkg].Flags & pkgCache::Flag::Auto))
+              (Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
+              _config->FindB("APT::Get::ReInstall",false) == false)
            {
               ioprintf(c1out,_("%s set to manual installed.\n"),
                        Pkg.Name());
@@ -2130,20 +2131,17 @@ bool DoSource(CommandLine &CmdL)
         pos += vcs.length()+2;
         string::size_type epos = srec.find("\n", pos);
         string uri = srec.substr(pos,epos-pos).c_str();
-        ioprintf(c1out, _("WARNING: '%s' is maintained in "
+        ioprintf(c1out, _("NOTICE: '%s' packaging is maintained in "
                           "the '%s' version control system at:\n"
                           "%s\n"),
                  Src.c_str(), vcs.c_str(), uri.c_str());
         if(vcs == "Bzr") 
            ioprintf(c1out,_("Please use:\n"
                             "bzr get %s\n"
-                            "to modify the package.\n"),
+                            "to retrieve the latest (possible unreleased) "
+                            "updates to the package.\n"),
                     uri.c_str());
-        ioprintf(c1out, "Are you sure you want to continue [yN]? ");
-        if(!YnPrompt(false))
-           return _error->Error(_("Abort."));
-        else 
-           break;
+        break;
       }
 
       // Back track
@@ -2501,6 +2499,7 @@ bool DoBuildDep(CommandLine &CmdL)
                            break;
                  }
                  if (CV.end() == true)
+                {
                   if (hasAlternatives)
                   {
                      continue;
@@ -2513,6 +2512,7 @@ bool DoBuildDep(CommandLine &CmdL)
                                            Last->BuildDepType((*D).Type),Src.c_str(),
                                            (*D).Package.c_str());
                   }
+                }
             }
             else
             {
@@ -2671,6 +2671,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"
       "   purge - Remove and purge packages\n"
       "   source - Download source archives\n"
       "   build-dep - Configure build-dependencies for source packages\n"
@@ -2781,7 +2782,9 @@ int main(int argc,const char *argv[])
                                    {"upgrade",&DoUpgrade},
                                    {"install",&DoInstall},
                                    {"remove",&DoInstall},
+                                   {"purge",&DoInstall},
                                   {"autoremove",&DoInstall},
+                                  {"purge",&DoInstall},
                                    {"dist-upgrade",&DoDistUpgrade},
                                    {"dselect-upgrade",&DoDSelectUpgrade},
                                   {"build-dep",&DoBuildDep},