* apt-pkg/algorithms.cc:

  - fix simulation performance drop (thanks to Ferenc Wagner
    for reporting the issue)

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index eaab4c0ea07fa46d951350e3b59eee81fa81f161..59f994cd7e606e0ad091f78000530e83e48341aa 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -37,7 +37,8 @@ pkgProblemResolver *pkgProblemResolver::This = 0;
    this is not necessary since the pkgCaches are fully shared now. */
 pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache),
                            iPolicy(Cache),
-                            Sim(&Cache->GetCache(),&iPolicy)
+                           Sim(&Cache->GetCache(),&iPolicy),
+                           group(Sim)
 {
    Sim.Init(0);
    Flags = new unsigned char[Cache->Head().PackageCount];

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index defaed57d9355aec35834272070f80edcfbfac4c..d183cd21303bde0e77a6935d85cf8113d14d7968 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -60,6 +60,7 @@ class pkgSimulate : public pkgPackageManager
    
    Policy iPolicy;
    pkgDepCache Sim;
+   pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);

diff --git a/debian/changelog b/debian/changelog
index 46d01bdf3dbb90d059bd6ebfc39745d317ac0d94..bef67eb6fea1c7357f3835e38600e70005923451 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,9 @@ apt (0.7.15) UNRELEASED; urgency=low
   * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
     - move the state file writting into the Go() implementation
       of dpkgpm (closes: #498799)
+  * apt-pkg/algorithms.cc:
+    - fix simulation performance drop (thanks to Ferenc Wagner
+      for reporting the issue)
   
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)