* apt-pkg/packagemanager.cc:

  - fix overly aggressive immediate config propergation
    (thanks to David Kalnischkies)

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 442143516286c597bd1b18f31a14d8b803fb6695..dbcd461acb3770996dde2d45a581c137f99839a4 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -125,7 +125,7 @@ bool pkgPackageManager::FixMissing()
 /* This adds the immediate flag to the pkg and recursively to the
    dependendies 
  */
 /* This adds the immediate flag to the pkg and recursively to the
    dependendies 
  */

-void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer)
+void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)

 {
    DepIterator D;
    
 {
    DepIterator D;
    


@@ -143,12 +143,16 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer)
    for ( /* nothing */  ; D.end() == false; D++)
       if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
       {
    for ( /* nothing */  ; D.end() == false; D++)
       if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
       {

+        // ignore dependencies if no instal/upgrade/remove is going to happen
+        if (D.TargetPkg() == 0 || Cache[D.TargetPkg()].Keep())
+             continue;
+

         if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
         {
            if(Debug)
         if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
         {
            if(Debug)

-              clog << "ImmediateAdd(): Adding Immediate flag to " << I.Name() << endl;
+              clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl;

            List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
            List->Flag(D.TargetPkg(),pkgOrderList::Immediate);

-           ImmediateAdd(D.TargetPkg(), UseInstallVer);
+           ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1);

         }
       }
    return;
         }
       }
    return;

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index a1bfdc52d7072a8a947c4511887168a88df9eaba..af1476b7ad82b94ad6399fcac4b8ba8013e523d2 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -49,7 +49,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool Debug;
          
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
    bool Debug;
          
    bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);

-   void ImmediateAdd(PkgIterator P, bool UseInstallVer);
+   void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0);

    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CreateOrderList();
    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
    bool CreateOrderList();

diff --git a/debian/changelog b/debian/changelog
index 8808a4e8278e482002492345a8679ac2741d02b8..9da06b0543e485f3429e6658a7b5d3cea720f497 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apt (0.7.25) UNRELEASED; urgency=low
 
 apt (0.7.25) UNRELEASED; urgency=low
 

+  [ Christian Perrier ]

   * Fix apt-ftparchive(1) wrt description of the "-o" option.
     Thanks to Dann Frazier for the patch. Closes: #273100
   * po/LINGUAS. Re-disable Hebrew. Closes: #534992
   * Fix apt-ftparchive(1) wrt description of the "-o" option.
     Thanks to Dann Frazier for the patch. Closes: #273100
   * po/LINGUAS. Re-disable Hebrew. Closes: #534992


@@ -10,8 +11,13 @@ apt (0.7.25) UNRELEASED; urgency=low
     Closes: #479997
   * Polish translation update by Wiktor Wandachowicz
     Closes: #548571
     Closes: #479997
   * Polish translation update by Wiktor Wandachowicz
     Closes: #548571

+  
+  [ Michael Vogt ]
+  * apt-pkg/packagemanager.cc:
+    - fix overly aggressive immediate config propergation
+      (thanks to David Kalnischkies)

 
 

- -- Christian Perrier <bubulle@debian.org>  Sat, 26 Sep 2009 11:17:25 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200

 
 apt (0.7.24) unstable; urgency=low
 
 
 apt (0.7.24) unstable; urgency=low