* apt-pkg/deb/dpkgpm.cc:

  - fix crash when a package is in removed but residual config state
    (LP: #923807)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 51e896a4ab969c02ed62a872d468e7dbcfdaba02..8c63b0c9bd4154594c92aaf47b4886d2a6050783 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -135,6 +135,33 @@ static void dpkgChrootDirectory()
 }
                                                                        /*}}}*/
 
+
+// FindNowVersion - Helper to find a Version in "now" state    /*{{{*/
+// ---------------------------------------------------------------------
+/* This is helpful when a package is no longer installed but has residual 
+ * config files
+ */
+static 
+pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg)
+{
+   pkgCache::VerIterator Ver;
+   for (Ver = Pkg.VersionList(); Ver.end() == false; Ver++)
+   {
+      pkgCache::VerFileIterator Vf = Ver.FileList();
+      pkgCache::PkgFileIterator F = Vf.File();
+      for (F = Vf.File(); F.end() == false; F++)
+      {
+         if (F && F.Archive())
+         {
+            if (strcmp(F.Archive(), "now")) 
+               return Ver;
+         }
+      }
+   }
+   return Ver;
+}
+                                                                       /*}}}*/
+
 // DPkgPM::pkgDPkgPM - Constructor                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1107,11 +1134,18 @@ bool pkgDPkgPM::Go(int OutStatusFd)
            {
               pkgCache::VerIterator PkgVer;
               std::string name = I->Pkg.Name();
-              if (Op == Item::Remove || Op == Item::Purge)
+              if (Op == Item::Remove || Op == Item::Purge) 
+               {
                  PkgVer = I->Pkg.CurrentVer();
+                  if(PkgVer.end() == true)
+                     PkgVer = FindNowVersion(I->Pkg);
+               }
               else
                  PkgVer = Cache[I->Pkg].InstVerIter(Cache);
-              name.append(":").append(PkgVer.Arch());
+               if (PkgVer.end() == false)
+                  name.append(":").append(PkgVer.Arch());
+               else
+                  _error->Warning("Can not find PkgVer for '%s'", name.c_str());
               char * const fullname = strdup(name.c_str());
               Packages.push_back(fullname);
               ADDARG(fullname);

diff --git a/debian/changelog b/debian/changelog
index 988a0e41e6099bfa863e603907eb199eaff4c691..122c2ce36b965f16537fdc9f397596c240fdcb96 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,11 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
       of them in a single iteration (Closes: #657695, LP: #922485)
     - use a signed int instead of short for score calculation as upgrades
       become so big now that it can overflow (Closes: #657732, LP: #917173)
+  
+  [ Michael Vogt ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - fix crash when a package is in removed but residual config state
+      (LP: #923807)
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 30 Jan 2012 19:17:09 +0100