X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f2120f3d61c716d5a2489a450ef41db7b49e8d51..640c5d948afa27a8e71eb6c03f1e0d55f81773c5:/cmdline/apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c36bac1a5..0d7e5239c 100644
--- 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.153 2004/01/26 18:10:57 mdz Exp $
+// $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -270,7 +270,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now)
 	 // Compute a single dependency element (glob or)
 	 pkgCache::DepIterator Start;
 	 pkgCache::DepIterator End;
-	 D.GlobOr(Start,End);
+	 D.GlobOr(Start,End); // advances D
 
 	 if (Cache->IsImportantDep(End) == false)
 	    continue;
@@ -673,7 +673,7 @@ bool CacheFile::CheckDeps(bool AllowBroken)
 /* 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 Saftey = true)
+		     bool Safety = true)
 {
    if (_config->FindB("APT::Get::Purge",false) == true)
    {
@@ -811,7 +811,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 	 return _error->Error(_("There are problems and -y was used without --force-yes"));
    }         
 
-   if (Essential == true && Saftey == true)
+   if (Essential == true && Safety == true)
    {
       if (_config->FindB("APT::Get::Trivial-Only",false) == true)
 	 return _error->Error(_("Trivial Only specified but this is not a trivial operation."));
@@ -1533,11 +1533,11 @@ bool DoInstall(CommandLine &CmdL)
 
 	 for (pkgCache::VerIterator V = I.VersionList(); V.end() == false; V++)
          {
-	     for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
+	     for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; )
              {
 		 pkgCache::DepIterator Start;
 		 pkgCache::DepIterator End;
-		 D.GlobOr(Start,End);
+		 D.GlobOr(Start,End); // advances D
 
 		 /* 
 		  * If this is a virtual package, we need to check the list of
@@ -2356,7 +2356,7 @@ void GetInitialize()
    _config->Set("APT::Get::Assume-Yes",false);
    _config->Set("APT::Get::Fix-Broken",false);
    _config->Set("APT::Get::Force-Yes",false);
-   _config->Set("APT::Get::APT::Get::No-List-Cleanup",true);
+   _config->Set("APT::Get::List-Cleanup",true);
 }
 									/*}}}*/
 // SigWinch - Window size change signal handler				/*{{{*/