Http download fixes

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 1cc983e47544e31b75d809ceb9699e7ab0050d73..da364e03c238f6ed673e8c2212b4df67ce216d72 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.36 1999/01/30 03:35:28 jgg Exp $
+// $Id: apt-get.cc,v 1.43 1999/02/21 08:38:53 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -36,6 +36,7 @@
 #include <apt-pkg/dpkgpm.h>
 #include <apt-pkg/dpkginit.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/clean.h>
 
 #include <config.h>
 
@@ -44,7 +45,10 @@
 #include <fstream.h>
 #include <termios.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/vfs.h>
 #include <signal.h>
+#include <unistd.h>
 #include <stdio.h>
                                                                        /*}}}*/
 
@@ -519,7 +523,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
    
    // 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
@@ -530,21 +535,31 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
       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
-   c2out << "Need to get ";
+   c1out << "Need to get ";
    if (DebBytes != FetchBytes)
-      c2out << SizeToStr(FetchBytes) << '/' << SizeToStr(DebBytes);
+      c1out << SizeToStr(FetchBytes) << "b/" << SizeToStr(DebBytes) << 'b';
    else
-      c2out << SizeToStr(DebBytes);
+      c1out << SizeToStr(DebBytes) << 'b';
       
    c1out << " of archives. After unpacking ";
    
    // Size delta
    if (Cache->UsrSize() >= 0)
-      c2out << SizeToStr(Cache->UsrSize()) << " will be used." << endl;
+      c1out << SizeToStr(Cache->UsrSize()) << "b will be used." << endl;
    else
-      c2out << SizeToStr(-1*Cache->UsrSize()) << " will be freed." << endl;
+      c1out << SizeToStr(-1*Cache->UsrSize()) << "b will be freed." << endl;
 
    if (_error->PendingError() == true)
       return false;
@@ -566,6 +581,15 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
       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)
@@ -762,11 +786,13 @@ bool DoInstall(CommandLine &CmdL)
               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;
         }
@@ -984,6 +1010,31 @@ bool DoClean(CommandLine &CmdL)
    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
@@ -1022,6 +1073,7 @@ bool ShowHelp(CommandLine &CmdL)
    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;
@@ -1091,6 +1143,7 @@ int main(int argc,const char *argv[])
       {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}};
@@ -1101,6 +1154,7 @@ int main(int argc,const char *argv[])
                                    {"dist-upgrade",&DoDistUpgrade},
                                    {"dselect-upgrade",&DoDSelectUpgrade},
                                    {"clean",&DoClean},
+                                   {"autoclean",&DoAutoClean},
                                    {"check",&DoCheck},
                                   {"help",&ShowHelp},
                                    {0,0}};