X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5819a76177d1ea1ed7e5b10f93804cc9730a560c..fc5aece9d8600b68cf8d654b379b6d840f2a5524:/apt-pkg/packagemanager.cc

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index d5b8eafb4..71a0dd034 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: packagemanager.cc,v 1.27 2001/05/07 05:49:43 jgg Exp $
+// $Id: packagemanager.cc,v 1.30 2003/04/27 03:04:15 doogie Exp $
 /* ######################################################################
 
    Package Manager - Abstacts the package manager
@@ -133,11 +133,15 @@ bool pkgPackageManager::CreateOrderList()
    delete List;
    List = new pkgOrderList(&Cache);
    
-   bool NoImmConfigure = _config->FindB("APT::Immediate-Configure",false);
+   bool NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
    
    // Generate the list of affected packages and sort it
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
    {
+      // Ignore no-version packages
+      if (I->VersionList == 0)
+	 continue;
+      
       // Mark the package and its dependends for immediate configuration
       if (((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
 	   (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
@@ -479,13 +483,16 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 
 	    Bad = !SmartConfigure(Pkg);
 	 }
-	 
+
 	 /* If this or element did not match then continue on to the
-	    next or element until a matching element is found*/
+	    next or element until a matching element is found */
 	 if (Bad == true)
-	 {	    
+	 {
+	    // This triggers if someone make a pre-depends/depend loop.
 	    if (Start == End)
-	       return _error->Error("Internal Error, Couldn't configure a pre-depend");
+	       return _error->Error("Couldn't configure pre-depend %s for %s, "
+				    "probably a dependency cycle.",
+				    End.TargetPkg().Name(),Pkg.Name());
 	    Start++;
 	 }
 	 else
@@ -620,16 +627,3 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    return Completed;
 }
 									/*}}}*/
-// PM::DoInstall - Does the installation				/*{{{*/
-// ---------------------------------------------------------------------
-/* This uses the filenames in FileNames and the information in the
-   DepCache to perform the installation of packages.*/
-pkgPackageManager::OrderResult pkgPackageManager::DoInstall()
-{
-   OrderResult Res = OrderInstall();
-   if (Res != Failed)
-      if (Go() == false)
-	 return Failed;
-   return Res;
-}
-									/*}}}*/