* apt-pkg/edsp.cc:

  - include reinstall requests and already installed (= protected) packages
    in the install-request for external resolvers (Closes: #689331)

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index adb8788b34f6c73c1476bdf4315d740d9b1a8e40..6ce9da784ee9b8d0b923b84b9220fe1569fc8ea2 100644 (file)
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -214,9 +214,11 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
       if (Progress != NULL && p % 100 == 0)
          Progress->Progress(p);
       string* req;
       if (Progress != NULL && p % 100 == 0)
          Progress->Progress(p);
       string* req;

-      if (Cache[Pkg].Delete() == true)
+      pkgDepCache::StateCache &P = Cache[Pkg];
+      if (P.Delete() == true)

         req = &del;
         req = &del;

-      else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true)
+      else if (P.NewInstall() == true || P.Upgrade() == true || P.ReInstall() == true ||
+              (P.Mode == pkgDepCache::ModeKeep && (P.iFlags & pkgDepCache::Protected) == pkgDepCache::Protected))

         req = &inst;
       else
         continue;
         req = &inst;
       else
         continue;

diff --git a/debian/changelog b/debian/changelog
index c1936a86500790972e312251d1e0793b1884ec17..545791f343816c7009e1356f71b2dc67bc1559a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ apt (0.9.7.6) UNRELEASED; urgency=low
       APT::Cache::ShowVersion is true (default: false) as discussed in
       #218995 to help debian-cd fixing #687949. Thanks to Sam Lidder
       for initial patch and Steve McIntyre for nagging and testing!
       APT::Cache::ShowVersion is true (default: false) as discussed in
       #218995 to help debian-cd fixing #687949. Thanks to Sam Lidder
       for initial patch and Steve McIntyre for nagging and testing!

+  * apt-pkg/edsp.cc:
+    - include reinstall requests and already installed (= protected) packages
+      in the install-request for external resolvers (Closes: #689331)

 
  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 19 Sep 2012 11:29:56 +0200
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 19 Sep 2012 11:29:56 +0200