releasing package apt version 1.0.5

[apt.git] / apt-pkg / orderlist.cc

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 86d2a94786ddeaff02d9ca0502fd954d24264f03..a1fcbcc98cd41d63f1247ca1faba934e625930ff 100644 (file)
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -68,10 +68,14 @@
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/version.h>

 #include <apt-pkg/sptr.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>

 
 

+#include <stdlib.h>
+#include <string.h>
+#include <string>

 #include <iostream>
                                                                        /*}}}*/
 
 #include <iostream>
                                                                        /*}}}*/
 


@@ -301,9 +305,8 @@ bool pkgOrderList::OrderConfigure()
 /* Higher scores order earlier */
 int pkgOrderList::Score(PkgIterator Pkg)
 {
 /* Higher scores order earlier */
 int pkgOrderList::Score(PkgIterator Pkg)
 {

-   static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 500);
-
-   // Removal is always done first
+   // Removals should be done after we dealt with essentials
+   static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 100);

    if (Cache[Pkg].Delete() == true)
       return ScoreDelete;
 
    if (Cache[Pkg].Delete() == true)
       return ScoreDelete;
 


@@ -567,10 +570,10 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical)
 // ---------------------------------------------------------------------
 /* This is the core ordering routine. It calls the set dependency
    consideration functions which then potentialy call this again. Finite
 // ---------------------------------------------------------------------
 /* This is the core ordering routine. It calls the set dependency
    consideration functions which then potentialy call this again. Finite

-   depth is achived through the colouring mechinism. */
+   depth is achieved through the colouring mechinism. */

 bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from)
 {
 bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from)
 {

-   // Looping or irrelevent.
+   // Looping or irrelevant.

    // This should probably trancend not installed packages
    if (Pkg.end() == true || IsFlag(Pkg,Added) == true || 
        IsFlag(Pkg,AddPending) == true || IsFlag(Pkg,InList) == false)
    // This should probably trancend not installed packages
    if (Pkg.end() == true || IsFlag(Pkg,Added) == true || 
        IsFlag(Pkg,AddPending) == true || IsFlag(Pkg,InList) == false)


@@ -825,7 +828,7 @@ bool pkgOrderList::DepUnPackPre(DepIterator D)
    The forwards depends loop is designed to bring the packages dependents
    close to the package. This helps reduce deconfigure time. 
    
    The forwards depends loop is designed to bring the packages dependents
    close to the package. This helps reduce deconfigure time. 
    

-   Loops are irrelevent to this. */
+   Loops are irrelevant to this. */

 bool pkgOrderList::DepUnPackDep(DepIterator D)
 {
    
 bool pkgOrderList::DepUnPackDep(DepIterator D)
 {
    


@@ -841,7 +844,7 @@ bool pkgOrderList::DepUnPackDep(DepIterator D)
                D.ParentPkg().CurrentVer() != D.ParentVer())
               continue;
 
                D.ParentPkg().CurrentVer() != D.ParentVer())
               continue;
 

-           // The dep will not break so it is irrelevent.
+           // The dep will not break so it is irrelevant.

            if (CheckDep(D) == true)
               continue;
            
            if (CheckDep(D) == true)
               continue;