Print out a message when doing regexing, change regex c...

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 76945b805c32f9e4f9e8365d816f44e56da1f72f..b4d832df3c7d0ea22d444c522572184f2e857965 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-get.cc,v 1.111 2001/11/04 17:09:18 tausq Exp $
+// $Id: apt-get.cc,v 1.121 2002/07/08 04:09:52 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -45,7 +45,8 @@
 
 #include "acqprogress.h"
 
-#include <fstream.h>
+#include <locale.h>
+#include <fstream>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -79,6 +80,13 @@ class CacheFile : public pkgCacheFile
    
    void Sort();
    bool CheckDeps(bool AllowBroken = false);
+   bool BuildCaches(bool WithLock = true)
+   {
+      OpTextProgress Prog(*_config);
+      if (pkgCacheFile::BuildCaches(Prog,WithLock) == false)
+        return false;
+      return true;
+   }
    bool Open(bool WithLock = true) 
    {
       OpTextProgress Prog(*_config);
@@ -511,7 +519,7 @@ void Stats(ostream &out,pkgDepCache &Dep)
    if (Downgrade != 0)
       ioprintf(out,_("%lu downgraded, "),Downgrade);
 
-   ioprintf(out,_("%lu to remove and %lu  not upgraded.\n"),
+   ioprintf(out,_("%lu to remove and %lu not upgraded.\n"),
            Dep.DelCount(),Dep.KeepCount());
    
    if (Dep.BadCount() != 0)
@@ -721,7 +729,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 
    /* Check for enough free space, but only if we are actually going to
       download */
-   if (_config->FindB("APT::Get::Print-URIs") == false)
+   if (_config->FindB("APT::Get::Print-URIs") == false &&
+       _config->FindB("APT::Get::Download",true) == true)
    {
       struct statvfs Buf;
       string OutputDir = _config->FindDir("Dir::Cache::Archives");
@@ -925,10 +934,15 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    pkgDepCache::StateCache &State = Cache[Pkg];
    if (Remove == true && Pkg->CurrentVer == 0)
    {
+      Fix.Clear(Pkg);
+      Fix.Protect(Pkg);
+      Fix.Remove(Pkg);
+      
       /* We want to continue searching for regex hits, so we return false here
          otherwise this is not really an error. */
       if (AllowFail == false)
-        return false;      
+        return false;
+      
       ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name());
       return true;
    }
@@ -1030,7 +1044,8 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
 bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
                    const char *VerTag,bool IsRel)
 {
-   pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release:pkgVersionMatch::Version));
+   pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release : 
+                                pkgVersionMatch::Version));
    
    pkgCache::VerIterator Ver = Match.Find(Pkg);
                         
@@ -1174,11 +1189,21 @@ bool DoUpdate(CommandLine &CmdL)
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
    pkgAcquire Fetcher(&Stat);
-   
+
    // Populate it with the source selection
    if (List.GetIndexes(&Fetcher) == false)
         return false;
    
+   // Just print out the uris an exit if the --print-uris flag was used
+   if (_config->FindB("APT::Get::Print-URIs") == true)
+   {
+      pkgAcquire::UriIterator I = Fetcher.UriBegin();
+      for (; I != Fetcher.UriEnd(); I++)
+        cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
+              I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl;
+      return true;
+   }
+   
    // Run it
    if (Fetcher.Run() == pkgAcquire::Failed)
       return false;
@@ -1206,7 +1231,7 @@ bool DoUpdate(CommandLine &CmdL)
    
    // Prepare the cache.   
    CacheFile Cache;
-   if (Cache.Open() == false)
+   if (Cache.BuildCaches() == false)
       return false;
    
    if (Failed == true)
@@ -1315,7 +1340,8 @@ bool DoInstall(CommandLine &CmdL)
         // Check if the name is a regex
         const char *I;
         for (I = S; *I != 0; I++)
-           if (*I == '.' || *I == '?' || *I == '*' || *I == '|')
+           if (*I == '?' || *I == '*' || *I == '|' ||
+               *I == '[' || *I == '^' || *I == '$')
               break;
         if (*I == 0)
            return _error->Error(_("Couldn't find package %s"),S);
@@ -1329,7 +1355,7 @@ bool DoInstall(CommandLine &CmdL)
         if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE |
                     REG_NOSUB)) != 0)
         {
-           char Error[300];
+           char Error[300];        
            regerror(Res,&Pattern,Error,sizeof(Error));
            return _error->Error(_("Regex compilation error - %s"),Error);
         }
@@ -1341,6 +1367,9 @@ bool DoInstall(CommandLine &CmdL)
            if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0)
               continue;
            
+           ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"),
+                    Pkg.Name(),S);
+           
            if (VerTag != 0)
               if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
                  return false;
@@ -1863,6 +1892,22 @@ bool DoBuildDep(CommandLine &CmdL)
       if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false)
        return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str());
    
+      // Also ensure that build-essential packages are present
+      Configuration::Item const *Opts = _config->Tree("APT::Build-Essential");
+      if (Opts) 
+        Opts = Opts->Child;
+      for (; Opts; Opts = Opts->Next)
+      {
+        if (Opts->Value.empty() == true)
+           continue;
+
+         pkgSrcRecords::Parser::BuildDepRec rec;
+        rec.Package = Opts->Value;
+        rec.Type = pkgSrcRecords::Parser::BuildDependIndep;
+        rec.Op = 0;
+        BuildDeps.insert(BuildDeps.begin(), rec);
+      }
+
       if (BuildDeps.size() == 0)
       {
         ioprintf(c1out,_("%s has no build depends.\n"),Src.c_str());
@@ -2133,11 +2178,15 @@ int main(int argc,const char *argv[])
                                    {"clean",&DoClean},
                                    {"autoclean",&DoAutoClean},
                                    {"check",&DoCheck},
-                                  {"source",&DoSource},
+                                  {"source",&DoSource},
                                   {"moo",&DoMoo},
-                                  {"help",&ShowHelp},
+                                  {"help",&ShowHelp},
                                    {0,0}};
-   
+
+   // Set up gettext support
+   setlocale(LC_ALL,"");
+   textdomain(PACKAGE);
+
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
    if (pkgInitConfig(*_config) == false ||