* apt-pkg/packagemanager.cc:

  - don't try to "unpack" pseudo packages twice

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 034cc83393ded9cd893a82bbfab634421a383bdf..eef79cccd381443da9de4a702c4eb555cf9a61ef 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -596,9 +596,17 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
    {
       if(Install(Pkg,FileNames[Pkg->ID]) == false)
          return false;
-   } else if (SmartUnPack(Pkg.Group().FindPkg("all")) == false)
-      return false;
-
+   } else {
+      // Pseudo packages will not be unpacked - instead we will do this
+      // for the "real" package, but only once and if it is already
+      // configured we don't need to unpack it again…
+      PkgIterator const P = Pkg.Group().FindPkg("all");
+      if (List->IsFlag(P,pkgOrderList::UnPacked) != true &&
+         List->IsFlag(P,pkgOrderList::Configured) != true) {
+        if (SmartUnPack(P) == false)
+           return false;
+      }
+   }
    List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
    
    // Perform immedate configuration of the package.

diff --git a/debian/changelog b/debian/changelog
index 16800a9d189b4d00f616c4fd9f9722c0f7cd1577..71aeb1504a75fa615c5908e9da9eb8496cb39f55 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.7.26~exp4) experimental; urgency=low
 
   * apt-pkg/depcache.cc:
     - "reinstall" the correct version for a killed pseudo package
+  * apt-pkg/packagemanager.cc:
+    - don't try to "unpack" pseudo packages twice
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 03 Apr 2010 14:58:39 +0200