Corrected call to getsockopt

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 2ae16a00a2bd3fdc5d90b7bc8147bd49455580ba..9749913a761b27fcbe7cc2755d94cb2fbc781efc 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.23 1998/12/05 04:36:10 jgg Exp $
+// $Id: apt-get.cc,v 1.32 1998/12/31 01:32:20 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -61,7 +61,7 @@ bool YnPrompt()
 {
    if (_config->FindB("APT::Get::Assume-Yes",false) == true)
    {
-      c2out << 'Y' << endl;
+      c1out << 'Y' << endl;
       return true;
    }
    
@@ -135,7 +135,7 @@ void ShowBroken(ostream &out,pkgDepCache &Cache)
         pkgCache::DepIterator Start;
         pkgCache::DepIterator End;
         D.GlobOr(Start,End);
-        
+
         if (Cache.IsImportantDep(End) == false || 
             (Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
            continue;
@@ -208,6 +208,7 @@ void ShowDel(ostream &out,pkgDepCache &Dep)
    for (;I.end() != true; I++)
       if (Dep[I].Delete() == true)
         List += string(I.Name()) + " ";
+   
    ShowList(out,"The following packages will be REMOVED:",List);
 }
                                                                        /*}}}*/
@@ -397,6 +398,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.");
+   if (_error->empty() == false)
+      _error->Warning("You may want to run apt-get update to correct theses missing files");
    
    Progress.Done();
    
@@ -483,7 +486,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
 
    if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && 
        Cache->BadCount() == 0)
-      return true;   
+      return true;
 
    // Run the simulator ..
    if (_config->FindB("APT::Get::Simulate") == true)
@@ -529,19 +532,19 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true)
    }
       
    // Number of bytes
-   c1out << "Need to get ";
+   c2out << "Need to get ";
    if (DebBytes != FetchBytes)
-      c1out << SizeToStr(FetchBytes) << '/' << SizeToStr(DebBytes);
+      c2out << SizeToStr(FetchBytes) << '/' << SizeToStr(DebBytes);
    else
-      c1out << SizeToStr(DebBytes);
+      c2out << SizeToStr(DebBytes);
       
    c1out << " of archives. After unpacking ";
    
    // Size delta
    if (Cache->UsrSize() >= 0)
-      c1out << SizeToStr(Cache->UsrSize()) << " will be used." << endl;
+      c2out << SizeToStr(Cache->UsrSize()) << " will be used." << endl;
    else
-      c1out << SizeToStr(-1*Cache->UsrSize()) << " will be freed." << endl;
+      c2out << SizeToStr(-1*Cache->UsrSize()) << " will be freed." << endl;
 
    if (_error->PendingError() == true)
       return false;
@@ -592,7 +595,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = 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)
       {
@@ -956,7 +959,7 @@ bool DoCheck(CommandLine &CmdL)
 // ShowHelp - Show a help screen                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-int ShowHelp()
+bool ShowHelp(CommandLine &CmdL)
 {
    cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE <<
        " compiled on " << __DATE__ << "  " << __TIME__ << endl;
@@ -990,7 +993,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 << "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;
 }
@@ -1055,6 +1058,7 @@ int main(int argc,const char *argv[])
                                    {"dselect-upgrade",&DoDSelectUpgrade},
                                    {"clean",&DoClean},
                                    {"check",&DoCheck},
+                                  {"help",&ShowHelp},
                                    {0,0}};
    
    // Parse the command line and initialize the package library
@@ -1069,7 +1073,7 @@ int main(int argc,const char *argv[])
    // See if the help should be shown
    if (_config->FindB("help") == true ||
        CmdL.FileSize() == 0)
-      return ShowHelp();
+      return ShowHelp(CmdL);
 
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());
@@ -1093,8 +1097,6 @@ int main(int argc,const char *argv[])
    {
       bool Errors = _error->PendingError();
       _error->DumpErrors();
-      if (Errors == true)
-        cout << "Returning 100." << endl;
       return Errors == true?100:0;
    }