fix Alt-Filename handling of file method

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

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 9cbb3fbd2373c1963ad871787c3328ace880f150..b4e803a6e2ba8e059826b4260a8f347ce3535a45 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -6,7 +6,7 @@
    Package Manager - Abstacts the package manager
 
    More work is needed in the area of transitioning provides, ie exim
    Package Manager - Abstacts the package manager
 
    More work is needed in the area of transitioning provides, ie exim

-   replacing smail. This can cause interesing side effects.
+   replacing smail. This can cause interesting side effects.

 
    Other cases involving conflicts+replaces should be tested. 
    
 
    Other cases involving conflicts+replaces should be tested. 
    


@@ -136,7 +136,7 @@ bool pkgPackageManager::FixMissing()
 // PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the
 // PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the

-   dependendies 
+   dependencies

  */
 void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {
  */
 void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {


@@ -189,7 +189,7 @@ bool pkgPackageManager::CreateOrderList()
       if (I->VersionList == 0)
         continue;
       
       if (I->VersionList == 0)
         continue;
       

-      // Mark the package and its dependends for immediate configuration
+      // Mark the package and its dependents for immediate configuration

       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
          NoImmConfigure == false) || ImmConfigureAll)
       {
       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
          NoImmConfigure == false) || ImmConfigureAll)
       {


@@ -408,7 +408,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
         pkgCache::DepIterator Start, End;
         D.GlobOr(Start,End);
 
         pkgCache::DepIterator Start, End;
         D.GlobOr(Start,End);
 

-        if (End->Type != pkgCache::Dep::Depends)
+        if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)

            continue;
         Bad = true;
 
            continue;
         Bad = true;
 


@@ -534,7 +534,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
            Discard.GlobOr(Start,End);
         }
 
            Discard.GlobOr(Start,End);
         }
 

-        if (End->Type != pkgCache::Dep::Depends)
+        if (End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::PreDepends)

            continue;
         Bad = true;
 
            continue;
         Bad = true;