Http download fixes

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 85373d874702d9fc3958b977df33200760a7627b..da364e03c238f6ed673e8c2212b4df67ce216d72 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.9 1998/11/13 04:24:03 jgg Exp $
+// $Id: apt-get.cc,v 1.43 1999/02/21 08:38:53 jgg Exp $

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


@@ -34,6 +34,9 @@
 #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 <apt-pkg/strutl.h>
+#include <apt-pkg/clean.h>

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


@@ -42,7 +45,11 @@
 #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>

                                                                        /*}}}*/
 
 ostream c0out;
                                                                        /*}}}*/
 
 ostream c0out;


@@ -51,14 +58,35 @@ ostream c2out;
 ofstream devnull("/dev/null");
 unsigned int ScreenWidth = 80;
 
 ofstream devnull("/dev/null");
 unsigned int ScreenWidth = 80;
 

+// YnPrompt - Yes No Prompt.                                           /*{{{*/
+// ---------------------------------------------------------------------
+/* Returns true on a Yes.*/
+bool YnPrompt()
+{
+   if (_config->FindB("APT::Get::Assume-Yes",false) == true)
+   {
+      c1out << 'Y' << endl;
+      return true;
+   }
+   
+   char C = 0;
+   char Jnk = 0;
+   read(STDIN_FILENO,&C,1);
+   while (C != '\n' && Jnk != '\n') read(STDIN_FILENO,&Jnk,1);
+   
+   if (!(C == 'Y' || C == 'y' || C == '\n' || C == '\r'))
+      return false;
+   return true;
+}
+                                                                       /*}}}*/

 // 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;


@@ -78,6 +106,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                                         /*{{{*/


@@ -87,8 +116,7 @@ void ShowList(ostream &out,string Title,string List)
    description. */
 void ShowBroken(ostream &out,pkgDepCache &Cache)
 {
    description. */
 void ShowBroken(ostream &out,pkgDepCache &Cache)
 {

-   out << "Sorry, but the following packages are broken - this means they have unmet" << endl;
-   out << "dependencies:" << endl;
+   out << "Sorry, but the following packages have unmet dependencies:" << endl;

    pkgCache::PkgIterator I = Cache.PkgBegin();
    for (;I.end() != true; I++)
    {
    pkgCache::PkgIterator I = Cache.PkgBegin();
    for (;I.end() != true; I++)
    {


@@ -105,31 +133,33 @@ void ShowBroken(ostream &out,pkgDepCache &Cache)
         continue;
       }
       
         continue;
       }
       

-      for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; D++)
+      for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false;)

       {
       {

-        if (Cache.IsImportantDep(D) == false || (Cache[D] &
-                                                 pkgDepCache::DepInstall) != 0)
+        // Compute a single dependency element (glob or)
+        pkgCache::DepIterator Start;
+        pkgCache::DepIterator End;
+        D.GlobOr(Start,End);
+
+        if (Cache.IsImportantDep(End) == false || 
+            (Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)

            continue;
         
         if (First == false)
            for (int J = 0; J != Indent; J++)
               out << ' ';
         First = false;
            continue;
         
         if (First == false)
            for (int J = 0; J != Indent; J++)
               out << ' ';
         First = false;

-        
-        if (D->Type == pkgCache::Dep::Conflicts)
-           out << " Conflicts:" << D.TargetPkg().Name();
-        else
-           out << " Depends:" << D.TargetPkg().Name();
+
+        cout << ' ' << End.DepType() << ": " << End.TargetPkg().Name();

         
         // Show a quick summary of the version requirements
         
         // Show a quick summary of the version requirements

-        if (D.TargetVer() != 0)
-           out << " (" << D.CompType() << " " << D.TargetVer() << 
+        if (End.TargetVer() != 0)
+           out << " (" << End.CompType() << " " << End.TargetVer() << 

            ")";
         
         /* Show a summary of the target package if possible. In the case
          of virtual packages we show nothing */
         
            ")";
         
         /* Show a summary of the target package if possible. In the case
          of virtual packages we show nothing */
         

-        pkgCache::PkgIterator Targ = D.TargetPkg();
+        pkgCache::PkgIterator Targ = End.TargetPkg();

         if (Targ->ProvidesList == 0)
         {
            out << " but ";
         if (Targ->ProvidesList == 0)
         {
            out << " but ";


@@ -182,6 +212,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);
 }
                                                                        /*}}}*/


@@ -225,7 +256,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;


@@ -236,7 +267,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                   /*{{{*/


@@ -244,7 +275,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;


@@ -273,22 +304,29 @@ void ShowEssential(ostream &out,pkgDepCache &Dep)
       // Print out any essential package depenendents that are to be removed
       for (pkgDepCache::DepIterator D = I.CurrentVer().DependsList(); D.end() == false; D++)
       {
       // Print out any essential package depenendents that are to be removed
       for (pkgDepCache::DepIterator D = I.CurrentVer().DependsList(); D.end() == false; D++)
       {

+        // Skip everything but depends
+        if (D->Type != pkgCache::Dep::PreDepends &&
+            D->Type != pkgCache::Dep::Depends)
+           continue;
+        

         pkgCache::PkgIterator P = D.SmartTargetPkg();
         if (Dep[P].Delete() == true)
         {
            if (Added[P->ID] == true)
               continue;
            Added[P->ID] = true;
         pkgCache::PkgIterator P = D.SmartTargetPkg();
         if (Dep[P].Delete() == true)
         {
            if (Added[P->ID] == true)
               continue;
            Added[P->ID] = true;

-           List += string(P.Name()) + " ";
+           
+           char S[300];
+           sprintf(S,"%s (due to %s) ",P.Name(),I.Name());
+           List += S;

         }       
       }      
    }
    
         }       
       }      
    }
    

+   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                                                /*{{{*/


@@ -327,12 +365,13 @@ class CacheFile
    FileFd *File;
    MMap *Map;
    pkgDepCache *Cache;
    FileFd *File;
    MMap *Map;
    pkgDepCache *Cache;

+   pkgDpkgLock Lock;

    
    inline operator pkgDepCache &() {return *Cache;};
    inline pkgDepCache *operator ->() {return Cache;};
    inline pkgDepCache &operator *() {return *Cache;};
    
    
    inline operator pkgDepCache &() {return *Cache;};
    inline pkgDepCache *operator ->() {return Cache;};
    inline pkgDepCache &operator *() {return *Cache;};
    

-   bool Open();
+   bool Open(bool AllowBroken = false);

    CacheFile() : File(0), Map(0), Cache(0) {};
    ~CacheFile()
    {
    CacheFile() : File(0), Map(0), Cache(0) {};
    ~CacheFile()
    {


@@ -346,8 +385,11 @@ class CacheFile
 // ---------------------------------------------------------------------
 /* This routine generates the caches and then opens the dependency cache
    and verifies that the system is OK. */
 // ---------------------------------------------------------------------
 /* This routine generates the caches and then opens the dependency cache
    and verifies that the system is OK. */

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

 {
 {

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

    // Create a progress class
    OpTextProgress Progress(*_config);
       
    // Create a progress class
    OpTextProgress Progress(*_config);
       


@@ -360,6 +402,8 @@ bool CacheFile::Open()
    pkgMakeStatusCache(List,Progress);
    if (_error->PendingError() == true)
       return _error->Error("The package lists or status file could not be parsed or opened.");
    pkgMakeStatusCache(List,Progress);
    if (_error->PendingError() == true)
       return _error->Error("The package lists or status file could not be parsed or opened.");

+   if (_error->empty() == false)
+      _error->Warning("You may want to run apt-get update to correct theses missing files");

    
    Progress.Done();
    
    
    Progress.Done();
    


@@ -387,7 +431,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


@@ -422,28 +466,31 @@ 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(pkgDepCache &Cache,bool ShwKept,bool Ask = true)
+bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)

 {
 {

+   bool Fail = false;
+   
+   // Show all the various warning indicators

    ShowDel(c1out,Cache);
    ShowNew(c1out,Cache);
    if (ShwKept == true)
       ShowKept(c1out,Cache);
    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);
+   Fail |= !ShowEssential(c1out,Cache);

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

-   if (Cache.BrokenCount() != 0)
+   if (Cache->BrokenCount() != 0)

    {
       ShowBroken(c1out,Cache);
       return _error->Error("Internal Error, InstallPackages was called with broken packages!");
    }
 
    {
       ShowBroken(c1out,Cache);
       return _error->Error("Internal Error, InstallPackages was called with broken packages!");
    }
 

-   if (Cache.DelCount() == 0 && Cache.InstCount() == 0 && 
-       Cache.BadCount() == 0)
-      return true;   
+   if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && 
+       Cache->BadCount() == 0)
+      return true;

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


@@ -454,6 +501,16 @@ bool InstallPackages(pkgDepCache &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
+   if (_config->FindB("Debug::NoLocking",false) == false)
+   {
+      FileFd Lock(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+      if (_error->PendingError() == true)
+        return _error->Error("Unable to lock the download directory");
+   }

    
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
    
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   


@@ -465,15 +522,123 @@ bool InstallPackages(pkgDepCache &Cache,bool ShwKept,bool Ask = true)
       return _error->Error("The list of sources could not be read.");
    
    // Create the package manager and prepare to download
       return _error->Error("The list of sources could not be read.");
    
    // Create the package manager and prepare to download

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

       return false;
 
       return false;
 

+   // Display statistics
+   unsigned long FetchBytes = Fetcher.FetchNeeded();
+   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/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 archives. After unpacking ";
+   
+   // Size delta
+   if (Cache->UsrSize() >= 0)
+      c1out << SizeToStr(Cache->UsrSize()) << "b will be used." << endl;
+   else
+      c1out << SizeToStr(-1*Cache->UsrSize()) << "b will be freed." << endl;
+
+   if (_error->PendingError() == true)
+      return false;
+
+   // Fail safe check
+   if (_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");
+   }         
+   
+   // 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);
+   }      
+
+   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;
    // 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;
+      
+      if ((*I)->Status == pkgAcquire::Item::StatIdle)
+      {
+        Transient = true;
+        Failed = true;
+        continue;
+      }
+      
+      cerr << "Failed to fetch " << (*I)->Describe() << endl;
+      cerr << "  " << (*I)->ErrorText << endl;
+      Failed = true;
+   }
+
+   if (_config->FindB("APT::Get::Download-Only",false) == true)
+      return true;

    
    

-   return true;
+   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?");
+   }
+   
+   // Try to deal with missing package files
+   if (PM.FixMissing() == false)
+   {
+      cerr << "Unable to correct missing packages." << endl;
+      return _error->Error("Aborting Install.");
+   }
+   
+   Cache.Lock.Close();
+   return PM.DoInstall();

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 


@@ -487,6 +652,14 @@ bool DoUpdate(CommandLine &)
    if (List.ReadMainList() == false)
       return false;
 
    if (List.ReadMainList() == false)
       return false;
 

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

    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
    pkgAcquire Fetcher(&Stat);
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
    pkgAcquire Fetcher(&Stat);


@@ -543,11 +716,16 @@ bool DoUpgrade(CommandLine &CmdL)
 bool DoInstall(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoInstall(CommandLine &CmdL)
 {
    CacheFile Cache;

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

       return false;
    
       return false;
    

-   int ExpectedInst = 0;
-   int Packages = 0;
+   // 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);
    
    bool DefRemove = false;
    pkgProblemResolver Fix(Cache);
    
    bool DefRemove = false;


@@ -565,15 +743,19 @@ bool DoInstall(CommandLine &CmdL)
       
       // See if we are removing the package
       bool Remove = DefRemove;
       
       // See if we are removing the package
       bool Remove = DefRemove;

-      if (S[Length - 1] == '-')
-      {
-        Remove = true;
-        S[--Length] = 0;
-      }
-      if (S[Length - 1] == '+')
+      if (Cache->FindPkg(S).end() == true)

       {
       {

-        Remove = false;
-        S[--Length] = 0;
+        // Handle an optional end tag indicating what to do
+        if (S[Length - 1] == '-')
+        {
+           Remove = true;
+           S[--Length] = 0;
+        }
+        if (S[Length - 1] == '+')
+        {
+           Remove = false;
+           S[--Length] = 0;
+        }

       }
       
       // Locate the package
       }
       
       // Locate the package


@@ -582,6 +764,14 @@ bool DoInstall(CommandLine &CmdL)
       if (Pkg.end() == true)
         return _error->Error("Couldn't find package %s",S);
       
       if (Pkg.end() == true)
         return _error->Error("Couldn't find package %s",S);
       

+      // Handle the no-upgrade case
+      if (_config->FindB("APT::Get::no-upgrade",false) == true &&
+         Pkg->CurrentVer != 0)
+      {
+        c1out << "Skipping " << Pkg.Name() << ", it is already installed and no-upgrade is set." << endl;
+        continue;
+      }
+      

       // Check if there is something new to install
       pkgDepCache::StateCache &State = (*Cache)[Pkg];
       if (State.CandidateVer == 0)
       // Check if there is something new to install
       pkgDepCache::StateCache &State = (*Cache)[Pkg];
       if (State.CandidateVer == 0)


@@ -596,11 +786,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;
         }


@@ -609,6 +801,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);


@@ -630,10 +832,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)


@@ -684,8 +897,9 @@ bool DoInstall(CommandLine &CmdL)
    }
 
    // See if we need to prompt
    }
 
    // See if we need to prompt

-   if (Cache->InstCount() != ExpectedInst || Cache->DelCount() != 0)
-      return InstallPackages(Cache,false,true);
+   if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0)
+      return InstallPackages(Cache,false,false);
+   

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


@@ -737,7 +951,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.


@@ -749,12 +963,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);


@@ -765,9 +1004,37 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
 /* */
 bool DoClean(CommandLine &CmdL)
 {
 /* */
 bool DoClean(CommandLine &CmdL)
 {

+   pkgAcquire Fetcher;
+   Fetcher.Clean(_config->FindDir("Dir::Cache::archives"));
+   Fetcher.Clean(_config->FindDir("Dir::Cache::archives") + "partial/");

    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(true) == 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


@@ -784,11 +1051,13 @@ bool DoCheck(CommandLine &CmdL)
 // 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;


@@ -804,11 +1073,12 @@ int ShowHelp()
    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;

-   cout << "  -h   This help text." << endl;
-   cout << "  -q   Loggable output - no progress indicator" << endl;
+   cout << "  -h  This help text." << endl;
+   cout << "  -q  Loggable output - no progress indicator" << endl;

    cout << "  -qq No output except for errors" << endl;
    cout << "  -d  Download only - do NOT install or unpack archives" << endl;
    cout << "  -s  No-act. Perform ordering simulation" << endl;
    cout << "  -qq No output except for errors" << endl;
    cout << "  -d  Download only - do NOT install or unpack archives" << endl;
    cout << "  -s  No-act. Perform ordering simulation" << endl;


@@ -818,7 +1088,7 @@ int ShowHelp()
    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 << "  -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 << "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;
 }


@@ -834,6 +1104,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                                /*{{{*/


@@ -855,6 +1126,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},


@@ -866,11 +1138,26 @@ int main(int argc,const char *argv[])
       {'y',"assume-yes","APT::Get::Assume-Yes",0},      
       {'f',"fix-broken","APT::Get::Fix-Broken",0},
       {'u',"show-upgraded","APT::Get::Show-Upgraded",0},
       {'y',"assume-yes","APT::Get::Assume-Yes",0},      
       {'f',"fix-broken","APT::Get::Fix-Broken",0},
       {'u',"show-upgraded","APT::Get::Show-Upgraded",0},

-      {'m',"ignore-missing","APT::Get::Fix-Broken",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,"ignore-hold","APT::Ingore-Hold",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},
+                                  {"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);


@@ -883,8 +1170,9 @@ 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);

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


@@ -901,41 +1189,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;
    }