* apt-pkg/deb/dpkgpm.cc:

  - skip --configure if all packages disappeared

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index eb9abe909fef1d4b2505a4579842f096443cec27..01808be243b3cfef5329c86aec9d27aba43d70c0 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1002,6 +1002,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       else
       {
         string const nativeArch = _config->Find("APT::Architecture");
+        unsigned long const oldSize = I->Op == Item::Configure ? Size : 0;
         for (;I != J && Size < MaxArgBytes; I++)
         {
            if((*I).Pkg.end() == true)
@@ -1016,8 +1017,11 @@ bool pkgDPkgPM::Go(int OutStatusFd)
               Args[n++] = Packages[pkgcount++];
            }
            Size += strlen(Args[n-1]);
-        }       
-      }      
+        }
+        // skip configure action if all sheduled packages disappeared
+        if (oldSize == Size)
+           continue;
+      }
       Args[n] = 0;
       J = I;
       

diff --git a/debian/changelog b/debian/changelog
index c7bb429ff963b6d2efaccabe3b36f42fc3d4b047..9f1944b629dd37d29e5ad66efd6a6b7023d73c7e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.8.13.1) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - skip --configure if all packages disappeared
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 16 Mar 2011 18:37:53 +0100
+
 apt (0.8.13) unstable; urgency=low
 
   [ Thorsten Spindler ]