* use mark-and-sweep from aptitude now as GC algorithm

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index cdefd0034fd98330bda689a7ad7a1e61e28c7f6d..9d97f8756eb9abf5f91e6ef9100bcba426891267 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -58,6 +58,7 @@
 #include <errno.h>
 #include <regex.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include <regex.h>
 #include <sys/wait.h>

+#include <sstream>

                                                                        /*}}}*/
 
 using namespace std;
                                                                        /*}}}*/
 
 using namespace std;


@@ -541,7 +542,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache)
    }
    
    delete [] Added;
    }
    
    delete [] Added;

-   return ShowList(out,_("WARNING: The following essential packages will be removed\n"
+   return ShowList(out,_("WARNING: The following essential packages will be removed.\n"

                         "This should NOT be done unless you know exactly what you are doing!"),List,VersionsList);
 }
 
                         "This should NOT be done unless you know exactly what you are doing!"),List,VersionsList);
 }
 


@@ -631,7 +632,7 @@ bool CacheFile::CheckDeps(bool AllowBroken)
 
    // Check that the system is OK
    if (DCache->DelCount() != 0 || DCache->InstCount() != 0)
 
    // Check that the system is OK
    if (DCache->DelCount() != 0 || DCache->InstCount() != 0)

-      return _error->Error("Internal Error, non-zero counts");
+      return _error->Error("Internal error, non-zero counts");

    
    // Apply corrections for half-installed packages
    if (pkgApplyStatus(*DCache) == false)
    
    // Apply corrections for half-installed packages
    if (pkgApplyStatus(*DCache) == false)


@@ -695,7 +696,7 @@ static bool CheckAuth(pkgAcquire& Fetcher)
    if (_config->FindI("quiet",0) < 2
        && _config->FindB("APT::Get::Assume-Yes",false) == false)
    {
    if (_config->FindI("quiet",0) < 2
        && _config->FindB("APT::Get::Assume-Yes",false) == false)
    {

-      c2out << _("Install these packages without verification? [y/N] ") << flush;
+      c2out << _("Install these packages without verification [y/N]? ") << flush;

       if (!YnPrompt(false))
          return _error->Error(_("Some packages could not be authenticated"));
 
       if (!YnPrompt(false))
          return _error->Error(_("Some packages could not be authenticated"));
 


@@ -750,7 +751,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    if (Cache->BrokenCount() != 0)
    {
       ShowBroken(c1out,Cache,false);
    if (Cache->BrokenCount() != 0)
    {
       ShowBroken(c1out,Cache,false);

-      return _error->Error("Internal Error, InstallPackages was called with broken packages!");
+      return _error->Error("Internal error, InstallPackages was called with broken packages!");

    }
 
    if (Cache->DelCount() == 0 && Cache->InstCount() == 0 &&
    }
 
    if (Cache->DelCount() == 0 && Cache->InstCount() == 0 &&


@@ -759,7 +760,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 
    // No remove flag
    if (Cache->DelCount() != 0 && _config->FindB("APT::Get::Remove",true) == false)
 
    // No remove flag
    if (Cache->DelCount() != 0 && _config->FindB("APT::Get::Remove",true) == false)

-      return _error->Error(_("Packages need to be removed but Remove is disabled."));
+      return _error->Error(_("Packages need to be removed but remove is disabled."));

        
    // Run the simulator ..
    if (_config->FindB("APT::Get::Simulate") == true)
        
    // Run the simulator ..
    if (_config->FindB("APT::Get::Simulate") == true)


@@ -769,7 +770,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
       if (Res == pkgPackageManager::Failed)
         return false;
       if (Res != pkgPackageManager::Completed)
       if (Res == pkgPackageManager::Failed)
         return false;
       if (Res != pkgPackageManager::Completed)

-        return _error->Error("Internal Error, Ordering didn't finish");
+        return _error->Error("Internal error, Ordering didn't finish");

       return true;
    }
    
       return true;
    }
    


@@ -862,7 +863,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
       
       const char *Prompt = _("Yes, do as I say!");
       ioprintf(c2out,
       
       const char *Prompt = _("Yes, do as I say!");
       ioprintf(c2out,

-              _("You are about to do something potentially harmful\n"
+              _("You are about to do something potentially harmful.\n"

                 "To continue type in the phrase '%s'\n"
                 " ?] "),Prompt);
       c2out << flush;
                 "To continue type in the phrase '%s'\n"
                 " ?] "),Prompt);
       c2out << flush;


@@ -883,7 +884,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
         if (_config->FindI("quiet",0) < 2 &&
             _config->FindB("APT::Get::Assume-Yes",false) == false)
         {
         if (_config->FindI("quiet",0) < 2 &&
             _config->FindB("APT::Get::Assume-Yes",false) == false)
         {

-           c2out << _("Do you want to continue? [Y/n] ") << flush;
+           c2out << _("Do you want to continue [Y/n]? ") << flush;

         
            if (YnPrompt() == false)
            {
         
            if (YnPrompt() == false)
            {


@@ -990,9 +991,9 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
       if (Failed == true && PM->FixMissing() == false)
       {
         cerr << _("Unable to correct missing packages.") << endl;
       if (Failed == true && PM->FixMissing() == false)
       {
         cerr << _("Unable to correct missing packages.") << endl;

-        return _error->Error(_("Aborting Install."));
+        return _error->Error(_("Aborting install."));

       }
       }

-                
+

       _system->UnLock();
       pkgPackageManager::OrderResult Res = PM->DoInstall();
       if (Res == pkgPackageManager::Failed || _error->PendingError() == true)
       _system->UnLock();
       pkgPackageManager::OrderResult Res = PM->DoInstall();
       if (Res == pkgPackageManager::Failed || _error->PendingError() == true)


@@ -1355,6 +1356,47 @@ bool DoUpdate(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// DoAutomaticRemove - Remove all automatic unused packages            /*{{{*/
+// ---------------------------------------------------------------------
+/* Remove unused automatic packages */
+bool DoAutomaticRemove(CacheFile &Cache)
+{
+   if(_config->FindI("Debug::pkgAutoRemove",false))
+      std::cout << "DoAutomaticRemove()" << std::endl;
+
+   if (_config->FindB("APT::Get::Remove",true) == false)
+      return _error->Error(_("We are not supposed to delete stuff, can't "
+                            "start AutoRemover"));
+
+   // do the actual work
+   pkgMarkUsed(Cache);
+
+   // look over the cache to see what can be removed
+   for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg)
+   {
+      if (Cache[Pkg].Garbage &&
+          (Pkg->CurrentVer != 0 && Cache[Pkg].Install() == false && 
+          Cache[Pkg].Delete() == false))
+      {
+         fprintf(stdout,"We could delete %s\n", Pkg.Name());
+         Cache->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false));
+      }
+   }
+
+   // Now see if we destroyed anything
+   if (Cache->BrokenCount() != 0)
+   {
+      c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n"
+                "shouldn't happen. Please file a bug report against apt.") << endl;
+      c1out << endl;
+      c1out << _("The following information may help to resolve the situation:") << endl;
+      c1out << endl;
+      ShowBroken(c1out,Cache,false);
+
+      return _error->Error(_("Internal Error, AutoRemover broke stuff"));
+   }
+   return true;
+}

 // DoUpgrade - Upgrade all packages                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* Upgrade all packages without installing new packages or erasing old
 // DoUpgrade - Upgrade all packages                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* Upgrade all packages without installing new packages or erasing old


@@ -1369,7 +1411,7 @@ bool DoUpgrade(CommandLine &CmdL)
    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache,false);
    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache,false);

-      return _error->Error(_("Internal Error, AllUpgrade broke stuff"));
+      return _error->Error(_("Internal error, AllUpgrade broke stuff"));

    }
    
    return InstallPackages(Cache,true);
    }
    
    return InstallPackages(Cache,true);


@@ -1380,6 +1422,15 @@ bool DoUpgrade(CommandLine &CmdL)
 /* Install named packages */
 bool DoInstall(CommandLine &CmdL)
 {
 /* Install named packages */
 bool DoInstall(CommandLine &CmdL)
 {

+   // Lock the list directory
+   FileFd Lock;
+   if (_config->FindB("Debug::NoLocking",false) == false)
+   {
+      Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
+      if (_error->PendingError() == true)
+        return _error->Error(_("Unable to lock the list directory"));
+   }
+   

    CacheFile Cache;
    if (Cache.OpenForInstall() == false || 
        Cache.CheckDeps(CmdL.FileSize() != 1) == false)
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || 
        Cache.CheckDeps(CmdL.FileSize() != 1) == false)


@@ -1546,6 +1597,11 @@ bool DoInstall(CommandLine &CmdL)
       return _error->Error(_("Broken packages"));
    }   
    
       return _error->Error(_("Broken packages"));
    }   
    

+   if (_config->FindB("APT::Get::AutomaticRemove")) {
+      if (!DoAutomaticRemove(Cache)) 
+        return false;
+   }
+

    /* Print out a list of packages that are going to be installed extra
       to what the user asked */
    if (Cache->InstCount() != ExpectedInst)
    /* Print out a list of packages that are going to be installed extra
       to what the user asked */
    if (Cache->InstCount() != ExpectedInst)


@@ -1565,8 +1621,8 @@ bool DoInstall(CommandLine &CmdL)
         
         if (*J == 0) {
            List += string(I.Name()) + " ";
         
         if (*J == 0) {
            List += string(I.Name()) + " ";

-        VersionsList += string(Cache[I].CandVersion) + "\n";
-     }
+           VersionsList += string(Cache[I].CandVersion) + "\n";
+        }

       }
       
       ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList);
       }
       
       ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList);


@@ -1661,7 +1717,7 @@ bool DoDistUpgrade(CommandLine &CmdL)
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;
 
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;
 

-   c0out << _("Calculating Upgrade... ") << flush;
+   c0out << _("Calculating upgrade... ") << flush;

    if (pkgDistUpgrade(*Cache) == false)
    {
       c0out << _("Failed") << endl;
    if (pkgDistUpgrade(*Cache) == false)
    {
       c0out << _("Failed") << endl;


@@ -1734,7 +1790,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
       if (Fix.Resolve() == false)
       {
         ShowBroken(c1out,Cache,false);
       if (Fix.Resolve() == false)
       {
         ShowBroken(c1out,Cache,false);

-        return _error->Error("Internal Error, problem resolver broke stuff");
+        return _error->Error("Internal error, problem resolver broke stuff");

       }
    }
 
       }
    }
 


@@ -1742,7 +1798,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache,false);
    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache,false);

-      return _error->Error("Internal Error, problem resolver broke stuff");
+      return _error->Error("Internal error, problem resolver broke stuff");

    }
    
    return InstallPackages(Cache,false);
    }
    
    return InstallPackages(Cache,false);


@@ -1930,7 +1986,7 @@ bool DoSource(CommandLine &CmdL)
    if (_config->FindB("APT::Get::Simulate",false) == true)
    {
       for (unsigned I = 0; I != J; I++)
    if (_config->FindB("APT::Get::Simulate",false) == true)
    {
       for (unsigned I = 0; I != J; I++)

-        ioprintf(cout,_("Fetch Source %s\n"),Dsc[I].Package.c_str());
+        ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());

       return true;
    }
    
       return true;
    }
    


@@ -2315,7 +2371,7 @@ bool ShowHelp(CommandLine &CmdL)
            
    if (_config->FindB("version") == true)
    {
            
    if (_config->FindB("version") == true)
    {

-      cout << _("Supported Modules:") << endl;
+      cout << _("Supported modules:") << endl;

       
       for (unsigned I = 0; I != pkgVersioningSystem::GlobalListLen; I++)
       {
       
       for (unsigned I = 0; I != pkgVersioningSystem::GlobalListLen; I++)
       {


@@ -2410,6 +2466,7 @@ void GetInitialize()
    _config->Set("APT::Get::Fix-Broken",false);
    _config->Set("APT::Get::Force-Yes",false);
    _config->Set("APT::Get::List-Cleanup",true);
    _config->Set("APT::Get::Fix-Broken",false);
    _config->Set("APT::Get::Force-Yes",false);
    _config->Set("APT::Get::List-Cleanup",true);

+   _config->Set("APT::Get::AutomaticRemove",false);

 }
                                                                        /*}}}*/
 // SigWinch - Window size change signal handler                                /*{{{*/
 }
                                                                        /*}}}*/
 // SigWinch - Window size change signal handler                                /*{{{*/


@@ -2465,6 +2522,7 @@ int main(int argc,const char *argv[])
       {0,"remove","APT::Get::Remove",0},
       {0,"only-source","APT::Get::Only-Source",0},
       {0,"arch-only","APT::Get::Arch-Only",0},
       {0,"remove","APT::Get::Remove",0},
       {0,"only-source","APT::Get::Only-Source",0},
       {0,"arch-only","APT::Get::Arch-Only",0},

+      {0,"automatic-remove","APT::Get::AutomaticRemove",0},

       {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0},
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0},
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},