Support for memory-only caching

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c90c0ed549cc03210e0fd06bfca62f301e8a29f7..07ba19f18aa6e153055e1946c20b0e3564736fcc 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.18 1998/11/23 07:03:13 jgg Exp $
+// $Id: apt-get.cc,v 1.52 1999/04/18 06:36:36 jgg Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -30,12 +30,14 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/sourcelist.h>

-#include <apt-pkg/pkgcachegen.h>

 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/dpkgpm.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/dpkgpm.h>

-#include <apt-pkg/dpkginit.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/clean.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/cachefile.h>

 
 #include <config.h>
 
 
 #include <config.h>
 


@@ -44,7 +46,10 @@
 #include <fstream.h>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <fstream.h>
 #include <termios.h>
 #include <sys/ioctl.h>

+#include <sys/stat.h>
+#include <sys/vfs.h>

 #include <signal.h>
 #include <signal.h>

+#include <unistd.h>

 #include <stdio.h>
                                                                        /*}}}*/
 
 #include <stdio.h>
                                                                        /*}}}*/
 


@@ -61,7 +66,7 @@ bool YnPrompt()
 {
    if (_config->FindB("APT::Get::Assume-Yes",false) == true)
    {
 {
    if (_config->FindB("APT::Get::Assume-Yes",false) == true)
    {

-      c2out << 'Y' << endl;
+      c1out << 'Y' << endl;

       return true;
    }
    
       return true;
    }
    


@@ -75,14 +80,26 @@ bool YnPrompt()
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// AnalPrompt - Annoying Yes No Prompt.                                        /*{{{*/
+// ---------------------------------------------------------------------
+/* Returns true on a Yes.*/
+bool AnalPrompt(const char *Text)
+{
+   char Buf[1024];
+   cin.getline(Buf,sizeof(Buf));
+   if (strcmp(Buf,Text) == 0)
+      return true;
+   return false;
+}
+                                                                       /*}}}*/

 // ShowList - Show a list                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* This prints out a string of space seperated words with a title and 
    a two space indent line wraped to the current screen width. */
 // ShowList - Show a list                                              /*{{{*/
 // ---------------------------------------------------------------------
 /* This prints out a string of space seperated words with a title and 
    a two space indent line wraped to the current screen width. */

-void ShowList(ostream &out,string Title,string List)
+bool ShowList(ostream &out,string Title,string List)

 {
    if (List.empty() == true)
 {
    if (List.empty() == true)

-      return;
+      return true;

 
    // Acount for the leading space
    int ScreenWidth = ::ScreenWidth - 3;
 
    // Acount for the leading space
    int ScreenWidth = ::ScreenWidth - 3;


@@ -102,6 +119,7 @@ void ShowList(ostream &out,string Title,string List)
       out << "  " << string(List,Start,End - Start) << endl;
       Start = End + 1;
    }   
       out << "  " << string(List,Start,End - Start) << endl;
       Start = End + 1;
    }   

+   return false;

 }
                                                                        /*}}}*/
 // ShowBroken - Debugging aide                                         /*{{{*/
 }
                                                                        /*}}}*/
 // ShowBroken - Debugging aide                                         /*{{{*/


@@ -134,7 +152,7 @@ void ShowBroken(ostream &out,pkgDepCache &Cache)
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;
         D.GlobOr(Start,End);
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;
         D.GlobOr(Start,End);

-        
+

         if (Cache.IsImportantDep(End) == false || 
             (Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            continue;
         if (Cache.IsImportantDep(End) == false || 
             (Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            continue;


@@ -207,6 +225,7 @@ void ShowDel(ostream &out,pkgDepCache &Dep)
    for (;I.end() != true; I++)
       if (Dep[I].Delete() == true)
         List += string(I.Name()) + " ";
    for (;I.end() != true; I++)
       if (Dep[I].Delete() == true)
         List += string(I.Name()) + " ";

+   

    ShowList(out,"The following packages will be REMOVED:",List);
 }
                                                                        /*}}}*/
    ShowList(out,"The following packages will be REMOVED:",List);
 }
                                                                        /*}}}*/


@@ -250,7 +269,7 @@ void ShowUpgraded(ostream &out,pkgDepCache &Dep)
 // ShowHold - Show held but changed packages                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHold - Show held but changed packages                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void ShowHold(ostream &out,pkgDepCache &Dep)
+bool ShowHold(ostream &out,pkgDepCache &Dep)

 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;
 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;


@@ -261,7 +280,7 @@ void ShowHold(ostream &out,pkgDepCache &Dep)
         List += string(I.Name()) + " ";
    }
 
         List += string(I.Name()) + " ";
    }
 

-   ShowList(out,"The following held packages will be changed:",List);
+   return ShowList(out,"The following held packages will be changed:",List);

 }
                                                                        /*}}}*/
 // ShowEssential - Show an essential package warning                   /*{{{*/
 }
                                                                        /*}}}*/
 // ShowEssential - Show an essential package warning                   /*{{{*/


@@ -269,7 +288,7 @@ void ShowHold(ostream &out,pkgDepCache &Dep)
 /* This prints out a warning message that is not to be ignored. It shows
    all essential packages and their dependents that are to be removed. 
    It is insanely risky to remove the dependents of an essential package! */
 /* This prints out a warning message that is not to be ignored. It shows
    all essential packages and their dependents that are to be removed. 
    It is insanely risky to remove the dependents of an essential package! */

-void ShowEssential(ostream &out,pkgDepCache &Dep)
+bool ShowEssential(ostream &out,pkgDepCache &Dep)

 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;
 {
    pkgCache::PkgIterator I = Dep.PkgBegin();
    string List;


@@ -317,11 +336,10 @@ void ShowEssential(ostream &out,pkgDepCache &Dep)
       }      
    }
    
       }      
    }
    

+   delete [] Added;

    if (List.empty() == false)
       out << "WARNING: The following essential packages will be removed" << endl;
    if (List.empty() == false)
       out << "WARNING: The following essential packages will be removed" << endl;

-   ShowList(out,"This should NOT be done unless you know exactly what you are doing!",List);
-
-   delete [] Added;
+   return ShowList(out,"This should NOT be done unless you know exactly what you are doing!",List);

 }
                                                                        /*}}}*/
 // Stats - Show some statistics                                                /*{{{*/
 }
                                                                        /*}}}*/
 // Stats - Show some statistics                                                /*{{{*/


@@ -353,68 +371,27 @@ void Stats(ostream &out,pkgDepCache &Dep)
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // class CacheFile - Cover class for some dependency cache functions   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-class CacheFile
+class CacheFile : public pkgCacheFile

 {
    public:
    
 {
    public:
    

-   FileFd *File;
-   MMap *Map;
-   pkgDepCache *Cache;
-   pkgDpkgLock Lock;
-   
-   inline operator pkgDepCache &() {return *Cache;};
-   inline pkgDepCache *operator ->() {return Cache;};
-   inline pkgDepCache &operator *() {return *Cache;};
-   
-   bool Open();
-   CacheFile() : File(0), Map(0), Cache(0) {};
-   ~CacheFile()
+   bool CheckDeps(bool AllowBroken = false);
+   bool Open(bool WithLock = true) 

    {
    {

-      delete Cache;
-      delete Map;
-      delete File;
-   }   
+      OpTextProgress Prog(*_config); 
+      return pkgCacheFile::Open(Prog,WithLock);
+   };

 };
                                                                        /*}}}*/
 // CacheFile::Open - Open the cache file                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This routine generates the caches and then opens the dependency cache
    and verifies that the system is OK. */
 };
                                                                        /*}}}*/
 // CacheFile::Open - Open the cache file                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This routine generates the caches and then opens the dependency cache
    and verifies that the system is OK. */

-bool CacheFile::Open()
+bool CacheFile::CheckDeps(bool AllowBroken)

 {
    if (_error->PendingError() == true)
       return false;
 {
    if (_error->PendingError() == true)
       return false;

-   
-   // Create a progress class
-   OpTextProgress Progress(*_config);
-      
-   // Read the source list
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
-      return _error->Error("The list of sources could not be read.");
-   
-   // Build all of the caches
-   pkgMakeStatusCache(List,Progress);
-   if (_error->PendingError() == true)
-      return _error->Error("The package lists or status file could not be parsed or opened.");
-   
-   Progress.Done();
-   
-   // Open the cache file
-   File = new FileFd(_config->FindFile("Dir::Cache::pkgcache"),FileFd::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   Map = new MMap(*File,MMap::Public | MMap::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   Cache = new pkgDepCache(*Map,Progress);
-   if (_error->PendingError() == true)
-      return false;

 
 

-   Progress.Done();
-   

    // Check that the system is OK
    if (Cache->DelCount() != 0 || Cache->InstCount() != 0)
       return _error->Error("Internal Error, non-zero counts");
    // Check that the system is OK
    if (Cache->DelCount() != 0 || Cache->InstCount() != 0)
       return _error->Error("Internal Error, non-zero counts");


@@ -424,7 +401,7 @@ bool CacheFile::Open()
       return false;
    
    // Nothing is broken
       return false;
    
    // Nothing is broken

-   if (Cache->BrokenCount() == 0)
+   if (Cache->BrokenCount() == 0 || AllowBroken == true)

       return true;
 
    // Attempt to fix broken things
       return true;
 
    // Attempt to fix broken things


@@ -459,17 +436,21 @@ bool CacheFile::Open()
 // ---------------------------------------------------------------------
 /* This displays the informative messages describing what is going to 
    happen and then calls the download routines */
 // ---------------------------------------------------------------------
 /* This displays the informative messages describing what is going to 
    happen and then calls the download routines */

-bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
+bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey = true)

 {
 {

+   bool Fail = false;
+   bool Essential = false;
+   

    // Show all the various warning indicators
    ShowDel(c1out,Cache);
    ShowNew(c1out,Cache);
    if (ShwKept == true)
       ShowKept(c1out,Cache);
    // Show all the various warning indicators
    ShowDel(c1out,Cache);
    ShowNew(c1out,Cache);
    if (ShwKept == true)
       ShowKept(c1out,Cache);

-   ShowHold(c1out,Cache);
+   Fail |= !ShowHold(c1out,Cache);

    if (_config->FindB("APT::Get::Show-Upgraded",false) == true)
       ShowUpgraded(c1out,Cache);
    if (_config->FindB("APT::Get::Show-Upgraded",false) == true)
       ShowUpgraded(c1out,Cache);

-   ShowEssential(c1out,Cache);
+   Essential = !ShowEssential(c1out,Cache);
+   Fail |= Essential;

    Stats(c1out,Cache);
    
    // Sanity check
    Stats(c1out,Cache);
    
    // Sanity check


@@ -481,7 +462,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
 
    if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && 
        Cache->BadCount() == 0)
 
    if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && 
        Cache->BadCount() == 0)

-      return true;   
+      return true;

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


@@ -492,11 +473,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
    
    // Create the text record parser
    pkgRecords Recs(Cache);
    
    // Create the text record parser
    pkgRecords Recs(Cache);

-
+   if (_error->PendingError() == true)
+      return false;
+   

    // Lock the archive directory
    // Lock the archive directory

+   FileFd Lock;

    if (_config->FindB("Debug::NoLocking",false) == false)
    {
    if (_config->FindB("Debug::NoLocking",false) == false)
    {

-      FileFd Lock(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+      Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));

       if (_error->PendingError() == true)
         return _error->Error("Unable to lock the download directory");
    }
       if (_error->PendingError() == true)
         return _error->Error("Unable to lock the download directory");
    }


@@ -512,66 +496,135 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
    
    // Create the package manager and prepare to download
    pkgDPkgPM PM(Cache);
    
    // Create the package manager and prepare to download
    pkgDPkgPM PM(Cache);

-   if (PM.GetArchives(&Fetcher,&List,&Recs) == false)
+   if (PM.GetArchives(&Fetcher,&List,&Recs) == false || 
+       _error->PendingError() == true)

       return false;
 
    // Display statistics
    unsigned long FetchBytes = Fetcher.FetchNeeded();
       return false;
 
    // Display statistics
    unsigned long FetchBytes = Fetcher.FetchNeeded();

+   unsigned long FetchPBytes = Fetcher.PartialPresent();

    unsigned long DebBytes = Fetcher.TotalNeeded();
    if (DebBytes != Cache->DebSize())
    {
       c0out << DebBytes << ',' << Cache->DebSize() << endl;
       c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl;
    }
    unsigned long DebBytes = Fetcher.TotalNeeded();
    if (DebBytes != Cache->DebSize())
    {
       c0out << DebBytes << ',' << Cache->DebSize() << endl;
       c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl;
    }

-      
+
+   // Check for enough free space
+   struct statfs Buf;
+   string OutputDir = _config->FindDir("Dir::Cache::Archives");
+   if (statfs(OutputDir.c_str(),&Buf) != 0)
+      return _error->Errno("statfs","Couldn't determine free space in %s",
+                          OutputDir.c_str());
+   if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+      return _error->Error("Sorry, you don't have enough free space in %s",
+                          OutputDir.c_str());
+   

    // Number of bytes
    c1out << "Need to get ";
    if (DebBytes != FetchBytes)
    // Number of bytes
    c1out << "Need to get ";
    if (DebBytes != FetchBytes)

-      c1out << SizeToStr(FetchBytes) << '/' << SizeToStr(DebBytes);
+      c1out << SizeToStr(FetchBytes) << "b/" << SizeToStr(DebBytes) << 'b';

    else
    else

-      c1out << SizeToStr(DebBytes);
+      c1out << SizeToStr(DebBytes) << 'b';

       
    c1out << " of archives. After unpacking ";
    
    // Size delta
    if (Cache->UsrSize() >= 0)
       
    c1out << " of archives. After unpacking ";
    
    // Size delta
    if (Cache->UsrSize() >= 0)

-      c1out << SizeToStr(Cache->UsrSize()) << " will be used." << endl;
+      c1out << SizeToStr(Cache->UsrSize()) << "b will be used." << endl;

    else
    else

-      c1out << SizeToStr(-1*Cache->UsrSize()) << " will be freed." << endl;
+      c1out << SizeToStr(-1*Cache->UsrSize()) << "b will be freed." << endl;

 
    if (_error->PendingError() == true)
       return false;
 
 
    if (_error->PendingError() == true)
       return false;
 

-   // Prompt to continue
-   if (Ask == true)
-   {      
-      if (_config->FindI("quiet",0) < 2 || 
-         _config->FindB("APT::Get::Assume-Yes",false) == false)
-      c2out << "Do you want to continue? [Y/n] " << flush;
-      if (YnPrompt() == false)
-        exit(1);
-   }      
+   // Fail safe check
+   if (_config->FindI("quiet",0) >= 2 ||
+       _config->FindB("APT::Get::Assume-Yes",false) == true)
+   {
+      if (Fail == true && _config->FindB("APT::Get::Force-Yes",false) == false)
+        return _error->Error("There are problems and -y was used without --force-yes");
+   }         

 
 

+   if (Essential == true && Saftey == true)
+   {
+      c2out << "You are about to do something potentially harmful" << endl;
+      c2out << "To continue type in the phrase 'Yes, I understand this may be bad'" << endl;
+      c2out << " ?] " << flush;
+      if (AnalPrompt("Yes, I understand this may be bad") == false)
+      {
+        c2out << "Abort." << endl;
+        exit(1);
+      }     
+   }
+   else
+   {
+      // Prompt to continue
+      if (Ask == true || Fail == true)
+      {            
+        if (_config->FindI("quiet",0) < 2 &&
+            _config->FindB("APT::Get::Assume-Yes",false) == false)
+        {
+           c2out << "Do you want to continue? [Y/n] " << flush;
+        
+           if (YnPrompt() == false)
+           {
+              c2out << "Abort." << endl;
+              exit(1);
+           }     
+        }       
+      }      
+   }
+   
+   // 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() == false)
       return false;
 
    // Print out errors
    bool Failed = false;
    // Run it
    if (Fetcher.Run() == false)
       return false;
 
    // Print out errors
    bool Failed = false;

+   bool Transient = false;

    for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
    {
       if ((*I)->Status == pkgAcquire::Item::StatDone &&
          (*I)->Complete == true)
         continue;
       
    for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
    {
       if ((*I)->Status == pkgAcquire::Item::StatDone &&
          (*I)->Complete == true)
         continue;
       

-      cerr << "Failed to fetch " << (*I)->Describe() << endl;
+      if ((*I)->Status == pkgAcquire::Item::StatIdle)
+      {
+        Transient = true;
+        Failed = true;
+        continue;
+      }
+      
+      cerr << "Failed to fetch " << (*I)->DescURI() << endl;

       cerr << "  " << (*I)->ErrorText << endl;
       Failed = true;
    }
       cerr << "  " << (*I)->ErrorText << endl;
       Failed = true;
    }

+
+   if (_config->FindB("APT::Get::Download-Only",false) == true)
+      return true;

    
    

-   if (Failed == true && _config->FindB("APT::Fix-Missing",false) == false)
+   if (Failed == true && _config->FindB("APT::Get::Fix-Missing",false) == false)
+   {
+      if (Transient == true)
+      {
+        c2out << "Upgrading with disk swapping is not supported in this version." << endl;
+        c2out << "Try running multiple times with --fix-missing" << endl;
+      }
+      

       return _error->Error("Unable to fetch some archives, maybe try with --fix-missing?");
       return _error->Error("Unable to fetch some archives, maybe try with --fix-missing?");

-
+   }
+   

    // Try to deal with missing package files
    if (PM.FixMissing() == false)
    {
    // Try to deal with missing package files
    if (PM.FixMissing() == false)
    {


@@ -579,7 +632,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
       return _error->Error("Aborting Install.");
    }
    
       return _error->Error("Aborting Install.");
    }
    

-   Cache.Lock.Close();
+   Cache.ReleaseLock();

    return PM.DoInstall();
 }
                                                                        /*}}}*/
    return PM.DoInstall();
 }
                                                                        /*}}}*/


@@ -595,9 +648,10 @@ bool DoUpdate(CommandLine &)
       return false;
 
    // Lock the list directory
       return false;
 
    // Lock the list directory

+   FileFd Lock;

    if (_config->FindB("Debug::NoLocking",false) == false)
    {
    if (_config->FindB("Debug::NoLocking",false) == false)
    {

-      FileFd Lock(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
+      Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));

       if (_error->PendingError() == true)
         return _error->Error("Unable to lock the list directory");
    }
       if (_error->PendingError() == true)
         return _error->Error("Unable to lock the list directory");
    }


@@ -626,7 +680,7 @@ bool DoUpdate(CommandLine &)
    
    // Prepare the cache.   
    CacheFile Cache;
    
    // Prepare the cache.   
    CacheFile Cache;

-   if (Cache.Open() == false)
+   if (Cache.Open() == false || Cache.CheckDeps() == false)

       return false;
    
    return true;
       return false;
    
    return true;


@@ -639,7 +693,7 @@ bool DoUpdate(CommandLine &)
 bool DoUpgrade(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoUpgrade(CommandLine &CmdL)
 {
    CacheFile Cache;

-   if (Cache.Open() == false)
+   if (Cache.Open() == false || Cache.CheckDeps() == false)

       return false;
 
    // Do the upgrade
       return false;
 
    // Do the upgrade


@@ -658,9 +712,14 @@ bool DoUpgrade(CommandLine &CmdL)
 bool DoInstall(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoInstall(CommandLine &CmdL)
 {
    CacheFile Cache;

-   if (Cache.Open() == false)
+   if (Cache.Open() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false)

       return false;
    
       return false;
    

+   // Enter the special broken fixing mode if the user specified arguments
+   bool BrokenFix = false;
+   if (Cache->BrokenCount() != 0)
+      BrokenFix = true;
+   

    unsigned int ExpectedInst = 0;
    unsigned int Packages = 0;
    pkgProblemResolver Fix(Cache);
    unsigned int ExpectedInst = 0;
    unsigned int Packages = 0;
    pkgProblemResolver Fix(Cache);


@@ -723,11 +782,13 @@ bool DoInstall(CommandLine &CmdL)
               pkgCache::PkgIterator Pkg = I.OwnerPkg();
               
               if ((*Cache)[Pkg].CandidateVerIter(*Cache) == I.OwnerVer())
               pkgCache::PkgIterator Pkg = I.OwnerPkg();
               
               if ((*Cache)[Pkg].CandidateVerIter(*Cache) == I.OwnerVer())

-                 c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl;
-
-              if ((*Cache)[Pkg].InstVerIter(*Cache) == I.OwnerVer())
-                 c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() <<
-                   " [Installed]"<< endl;
+              {
+                 if ((*Cache)[Pkg].Install() == true && (*Cache)[Pkg].NewInstall() == false)
+                    c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() <<
+                    " [Installed]"<< endl;
+                 else
+                    c1out << "  " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl;
+              }      

            }
            c1out << "You should explicly select one to install." << endl;
         }
            }
            c1out << "You should explicly select one to install." << endl;
         }


@@ -736,6 +797,16 @@ bool DoInstall(CommandLine &CmdL)
            c1out << "Package " << S << " has no available version, but exists in the database." << endl;
            c1out << "This typically means that the package was mentioned in a dependency and " << endl;
            c1out << "never uploaded, or that it is an obsolete package." << endl;
            c1out << "Package " << S << " has no available version, but exists in the database." << endl;
            c1out << "This typically means that the package was mentioned in a dependency and " << endl;
            c1out << "never uploaded, or that it is an obsolete package." << endl;

+           
+           string List;
+           pkgCache::DepIterator Dep = Pkg.RevDependsList();
+           for (; Dep.end() == false; Dep++)
+           {
+              if (Dep->Type != pkgCache::Dep::Replaces)
+                 continue;
+              List += string(Dep.ParentPkg().Name()) + " ";
+           }       
+           ShowList(c1out,"However the following packages replace it:",List);

         }
         
         return _error->Error("Package %s has no installation candidate",S);
         }
         
         return _error->Error("Package %s has no installation candidate",S);


@@ -757,10 +828,21 @@ bool DoInstall(CommandLine &CmdL)
         ExpectedInst++;
 
       // Install it with autoinstalling enabled.
         ExpectedInst++;
 
       // Install it with autoinstalling enabled.

-      if (State.InstBroken() == true)
+      if (State.InstBroken() == true && BrokenFix == false)

         Cache->MarkInstall(Pkg,true);
    }
 
         Cache->MarkInstall(Pkg,true);
    }
 

+   /* If we are in the Broken fixing mode we do not attempt to fix the
+      problems. This is if the user invoked install without -f and gave
+      packages */
+   if (BrokenFix == true && Cache->BrokenCount() != 0)
+   {
+      c1out << "You might want to run `apt-get -f install' to correct these." << endl;
+      ShowBroken(c1out,Cache);
+
+      return _error->Error("Unmet dependencies. Try using -f.");
+   }
+   

    // Call the scored problem resolver
    Fix.InstallProtect();
    if (Fix.Resolve(true) == false)
    // Call the scored problem resolver
    Fix.InstallProtect();
    if (Fix.Resolve(true) == false)


@@ -823,7 +905,7 @@ bool DoInstall(CommandLine &CmdL)
 bool DoDistUpgrade(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoDistUpgrade(CommandLine &CmdL)
 {
    CacheFile Cache;

-   if (Cache.Open() == false)
+   if (Cache.Open() == false || Cache.CheckDeps() == false)

       return false;
 
    c0out << "Calculating Upgrade... " << flush;
       return false;
 
    c0out << "Calculating Upgrade... " << flush;


@@ -845,7 +927,7 @@ bool DoDistUpgrade(CommandLine &CmdL)
 bool DoDSelectUpgrade(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoDSelectUpgrade(CommandLine &CmdL)
 {
    CacheFile Cache;

-   if (Cache.Open() == false)
+   if (Cache.Open() == false || Cache.CheckDeps() == false)

       return false;
    
    // Install everything with the install flag set
       return false;
    
    // Install everything with the install flag set


@@ -865,7 +947,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
       /* Install the package only if it is a new install, the autoupgrader
          will deal with the rest */
       if (I->SelectedState == pkgCache::State::Install)
       /* Install the package only if it is a new install, the autoupgrader
          will deal with the rest */
       if (I->SelectedState == pkgCache::State::Install)

-        Cache->MarkInstall(I);
+        Cache->MarkInstall(I,true);

    }
    
    // Apply erasures now, they override everything else.
    }
    
    // Apply erasures now, they override everything else.


@@ -877,12 +959,37 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
         Cache->MarkDelete(I);
    }
 
         Cache->MarkDelete(I);
    }
 

-   /* Use updates smart upgrade to do the rest, it will automatically
-      ignore held items */
+   /* Resolve any problems that dselect created, allupgrade cannot handle
+      such things. We do so quite agressively too.. */
+   if (Cache->BrokenCount() != 0)
+   {      
+      pkgProblemResolver Fix(Cache);
+
+      // Hold back held packages.
+      if (_config->FindB("APT::Ingore-Hold",false) == false)
+      {
+        for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() == false; I++)
+        {
+           if (I->SelectedState == pkgCache::State::Hold)
+           {
+              Fix.Protect(I);
+              Cache->MarkKeep(I);
+           }
+        }
+      }
+   
+      if (Fix.Resolve() == false)
+      {
+        ShowBroken(c1out,Cache);
+        return _error->Error("Internal Error, problem resolver broke stuff");
+      }
+   }
+
+   // Now upgrade everything

    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache);
    if (pkgAllUpgrade(Cache) == false)
    {
       ShowBroken(c1out,Cache);

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

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


@@ -899,6 +1006,31 @@ bool DoClean(CommandLine &CmdL)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// DoAutoClean - Smartly remove downloaded archives                    /*{{{*/
+// ---------------------------------------------------------------------
+/* This is similar to clean but it only purges things that cannot be 
+   downloaded, that is old versions of cached packages. */
+class LogCleaner : public pkgArchiveCleaner
+{
+   protected:
+   virtual void Erase(const char *File,string Pkg,string Ver,struct stat &St) 
+   {
+      cout << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "b]" << endl;
+   };
+};
+
+bool DoAutoClean(CommandLine &CmdL)
+{
+   CacheFile Cache;
+   if (Cache.Open() == false)
+      return false;
+   
+   LogCleaner Cleaner;
+   
+   return Cleaner.Go(_config->FindDir("Dir::Cache::archives"),*Cache) &&
+      Cleaner.Go(_config->FindDir("Dir::Cache::archives") + "partial/",*Cache);
+}
+                                                                       /*}}}*/

 // DoCheck - Perform the check operation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Opening automatically checks the system, this command is mostly used
 // DoCheck - Perform the check operation                               /*{{{*/
 // ---------------------------------------------------------------------
 /* Opening automatically checks the system, this command is mostly used


@@ -907,19 +1039,171 @@ bool DoCheck(CommandLine &CmdL)
 {
    CacheFile Cache;
    Cache.Open();
 {
    CacheFile Cache;
    Cache.Open();

+   Cache.CheckDeps();

    
    return true;
 }
                                                                        /*}}}*/
    
    return true;
 }
                                                                        /*}}}*/

+// DoSource - Fetch a source archive                                   /*{{{*/
+// ---------------------------------------------------------------------
+/* Fetch souce packages */
+bool DoSource(CommandLine &CmdL)
+{
+   CacheFile Cache;
+   if (Cache.Open(false) == false)
+      return false;
+
+   if (CmdL.FileSize() <= 1)
+      return _error->Error("Must specify at least one package to fetch source for");
+   
+   // Read the source list
+   pkgSourceList List;
+   if (List.ReadMainList() == false)
+      return _error->Error("The list of sources could not be read.");
+   
+   // Create the text record parsers
+   pkgRecords Recs(Cache);
+   pkgSrcRecords SrcRecs(List);
+   if (_error->PendingError() == true)
+      return false;
+
+   // Create the download object
+   AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
+   pkgAcquire Fetcher(&Stat);
+   
+   // Load the requestd sources into the fetcher
+   for (const char **I = CmdL.FileList + 1; *I != 0; I++)
+   {
+      string Src;
+      
+      /* Lookup the version of the package we would install if we were to
+         install a version and determine the source package name, then look
+         in the archive for a source package of the same name. In theory
+         we could stash the version string as well and match that too but
+         today there aren't multi source versions in the archive. */
+      pkgCache::PkgIterator Pkg = Cache->FindPkg(*I);
+      if (Pkg.end() == false)
+      {
+        pkgCache::VerIterator Ver = Cache->GetCandidateVer(Pkg);
+        if (Ver.end() == false)
+        {
+           pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+           Src = Parse.SourcePkg();
+        }       
+      }   
+
+      // No source package name..
+      if (Src.empty() == true)
+        Src = *I;

       
       

+      // The best hit
+      pkgSrcRecords::Parser *Last = 0;
+      unsigned long Offset = 0;
+      string Version;
+        
+      // Iterate over all of the hits
+      pkgSrcRecords::Parser *Parse;
+      SrcRecs.Restart();
+      while ((Parse = SrcRecs.Find(Src.c_str(),false)) != 0)
+      {
+        string Ver = Parse->Version();
+        if (Last == 0 || pkgVersionCompare(Version,Ver) < 0)
+        {
+           Last = Parse;
+           Offset = Parse->Offset();
+           Version = Ver;
+        }      
+      }
+      
+      if (Last == 0)
+        return _error->Error("Unable to find a source package for %s",Src.c_str());
+      
+      // Back track
+      vector<pkgSrcRecords::File> Lst;
+      if (Last->Jump(Offset) == false || Last->Files(Lst) == false)
+        return false;
+
+      // Load them into the fetcher
+      for (vector<pkgSrcRecords::File>::const_iterator I = Lst.begin();
+          I != Lst.end(); I++)
+      {
+        // Try to guess what sort of file it is we are getting.
+        string Comp;
+        if (I->Path.find(".dsc") != string::npos)
+           Comp = "dsc";
+        if (I->Path.find(".tar.gz") != string::npos)
+           Comp = "tar";
+        if (I->Path.find(".diff.gz") != string::npos)
+           Comp = "diff";
+        
+        new pkgAcqFile(&Fetcher,Last->Source()->ArchiveURI(I->Path),
+                       I->MD5Hash,I->Size,Last->Source()->SourceInfo(Src,
+                       Last->Version(),Comp),Src);
+      }
+   }
+   
+   // Display statistics
+   unsigned long FetchBytes = Fetcher.FetchNeeded();
+   unsigned long FetchPBytes = Fetcher.PartialPresent();
+   unsigned long DebBytes = Fetcher.TotalNeeded();
+
+   // Check for enough free space
+   struct statfs Buf;
+   string OutputDir = ".";
+   if (statfs(OutputDir.c_str(),&Buf) != 0)
+      return _error->Errno("statfs","Couldn't determine free space in %s",
+                          OutputDir.c_str());
+   if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+      return _error->Error("Sorry, you don't have enough free space in %s",
+                          OutputDir.c_str());
+   
+   // Number of bytes
+   c1out << "Need to get ";
+   if (DebBytes != FetchBytes)
+      c1out << SizeToStr(FetchBytes) << "b/" << SizeToStr(DebBytes) << 'b';
+   else
+      c1out << SizeToStr(DebBytes) << 'b';
+   c1out << " of source archives." << endl;
+
+   // 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() == false)
+      return false;
+
+   // Print error messages
+   for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
+   {
+      if ((*I)->Status == pkgAcquire::Item::StatDone &&
+         (*I)->Complete == true)
+        continue;
+      
+      cerr << "Failed to fetch " << (*I)->DescURI() << endl;
+      cerr << "  " << (*I)->ErrorText << endl;
+   }
+   
+   return true;
+}
+                                                                       /*}}}*/
+

 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-int ShowHelp()
+bool ShowHelp(CommandLine &CmdL)

 {
    cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE <<
        " compiled on " << __DATE__ << "  " << __TIME__ << endl;
 {
    cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE <<
        " compiled on " << __DATE__ << "  " << __TIME__ << endl;

-   
+   if (_config->FindB("version") == true)
+      return 100;
+       

    cout << "Usage: apt-get [options] command" << endl;
    cout << "       apt-get [options] install pkg1 [pkg2 ...]" << endl;
    cout << endl;
    cout << "Usage: apt-get [options] command" << endl;
    cout << "       apt-get [options] install pkg1 [pkg2 ...]" << endl;
    cout << endl;


@@ -932,9 +1216,11 @@ int ShowHelp()
    cout << "   upgrade - Perform an upgrade" << endl;
    cout << "   install - Install new packages (pkg is libc6 not libc6.deb)" << endl;
    cout << "   remove - Remove packages" << endl;
    cout << "   upgrade - Perform an upgrade" << endl;
    cout << "   install - Install new packages (pkg is libc6 not libc6.deb)" << endl;
    cout << "   remove - Remove packages" << endl;

+   cout << "   source - Download source archives" << endl;

    cout << "   dist-upgrade - Distribution upgrade, see apt-get(8)" << endl;
    cout << "   dselect-upgrade - Follow dselect selections" << endl;
    cout << "   clean - Erase downloaded archive files" << endl;
    cout << "   dist-upgrade - Distribution upgrade, see apt-get(8)" << endl;
    cout << "   dselect-upgrade - Follow dselect selections" << endl;
    cout << "   clean - Erase downloaded archive files" << endl;

+   cout << "   autoclean - Erase old downloaded archive files" << endl;

    cout << "   check - Verify that there are no broken dependencies" << endl;
    cout << endl;
    cout << "Options:" << endl;
    cout << "   check - Verify that there are no broken dependencies" << endl;
    cout << endl;
    cout << "Options:" << endl;


@@ -948,8 +1234,8 @@ int ShowHelp()
    cout << "  -m  Attempt to continue if archives are unlocatable" << endl;
    cout << "  -u  Show a list of upgraded packages as well" << endl;
    cout << "  -c=? Read this configuration file" << endl;
    cout << "  -m  Attempt to continue if archives are unlocatable" << endl;
    cout << "  -u  Show a list of upgraded packages as well" << endl;
    cout << "  -c=? Read this configuration file" << endl;

-   cout << "  -o=? Set an arbitary configuration option, ie -o dir::cache=/tmp" << endl;
-   cout << "See the apt-get(8), sources.list(8) and apt.conf(8) manual" << endl;
+   cout << "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp" << endl;
+   cout << "See the apt-get(8), sources.list(5) and apt.conf(5) manual" << endl;

    cout << "pages for more information." << endl;
    return 100;
 }
    cout << "pages for more information." << endl;
    return 100;
 }


@@ -965,6 +1251,7 @@ void GetInitialize()
    _config->Set("APT::Get::Simulate",false);
    _config->Set("APT::Get::Assume-Yes",false);
    _config->Set("APT::Get::Fix-Broken",false);
    _config->Set("APT::Get::Simulate",false);
    _config->Set("APT::Get::Assume-Yes",false);
    _config->Set("APT::Get::Fix-Broken",false);

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

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


@@ -986,6 +1273,7 @@ int main(int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},

+      {'v',"version","version",0},

       {'q',"quiet","quiet",CommandLine::IntLevel},
       {'q',"silent","quiet",CommandLine::IntLevel},
       {'d',"download-only","APT::Get::Download-Only",0},
       {'q',"quiet","quiet",CommandLine::IntLevel},
       {'q',"silent","quiet",CommandLine::IntLevel},
       {'d',"download-only","APT::Get::Download-Only",0},


@@ -1000,10 +1288,24 @@ int main(int argc,const char *argv[])
       {'m',"ignore-missing","APT::Get::Fix-Missing",0},
       {0,"fix-missing","APT::Get::Fix-Missing",0},
       {0,"ignore-hold","APT::Ingore-Hold",0},      
       {'m',"ignore-missing","APT::Get::Fix-Missing",0},
       {0,"fix-missing","APT::Get::Fix-Missing",0},
       {0,"ignore-hold","APT::Ingore-Hold",0},      

-      {0,"no-upgrade","APT::Get::no-upgrade",0},      
+      {0,"no-upgrade","APT::Get::no-upgrade",0},
+      {0,"force-yes","APT::Get::force-yes",0},
+      {0,"print-uris","APT::Get::Print-URIs",0},

       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};

+   CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate},
+                                   {"upgrade",&DoUpgrade},
+                                   {"install",&DoInstall},
+                                   {"remove",&DoInstall},
+                                   {"dist-upgrade",&DoDistUpgrade},
+                                   {"dselect-upgrade",&DoDSelectUpgrade},
+                                   {"clean",&DoClean},
+                                   {"autoclean",&DoAutoClean},
+                                   {"check",&DoCheck},
+                                  {"source",&DoSource},
+                                  {"help",&ShowHelp},
+                                   {0,0}};

    
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
    
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);


@@ -1016,9 +1318,14 @@ int main(int argc,const char *argv[])
 
    // See if the help should be shown
    if (_config->FindB("help") == true ||
 
    // See if the help should be shown
    if (_config->FindB("help") == true ||

+       _config->FindB("version") == true ||

        CmdL.FileSize() == 0)
        CmdL.FileSize() == 0)

-      return ShowHelp();
+      return ShowHelp(CmdL);

 
 

+   // Deal with stdout not being a tty
+   if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1)
+      _config->Set("quiet","1");
+   

    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
    c1out.rdbuf(cout.rdbuf());
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
    c1out.rdbuf(cout.rdbuf());


@@ -1034,41 +1341,13 @@ int main(int argc,const char *argv[])
    SigWinch(0);
    
    // Match the operation
    SigWinch(0);
    
    // Match the operation

-   struct 
-   {
-      const char *Match;
-      bool (*Handler)(CommandLine &);
-   } Map[] = {{"update",&DoUpdate},
-              {"upgrade",&DoUpgrade},
-              {"install",&DoInstall},
-              {"remove",&DoInstall},
-              {"dist-upgrade",&DoDistUpgrade},
-              {"dselect-upgrade",&DoDSelectUpgrade},
-              {"clean",&DoClean},
-              {"check",&DoCheck},
-              {0,0}};
-   int I;
-   for (I = 0; Map[I].Match != 0; I++)
-   {
-      if (strcmp(CmdL.FileList[0],Map[I].Match) == 0)
-      {
-        if (Map[I].Handler(CmdL) == false && _error->PendingError() == false)
-           _error->Error("Handler silently failed");
-        break;
-      }
-   }
-      
-   // No matching name
-   if (Map[I].Match == 0)
-      _error->Error("Invalid operation %s", CmdL.FileList[0]);
+   CmdL.DispatchArg(Cmds);

 
    // Print any errors or warnings found during parsing
    if (_error->empty() == false)
    {
       bool Errors = _error->PendingError();
       _error->DumpErrors();
 
    // Print any errors or warnings found during parsing
    if (_error->empty() == false)
    {
       bool Errors = _error->PendingError();
       _error->DumpErrors();

-      if (Errors == true)
-        cout << "Returning 100." << endl;

       return Errors == true?100:0;
    }
    
       return Errors == true?100:0;
    }