* apt-pkg/orderlist.cc:

  - untouched packages are never missing
* apt-pkg/packagemanager.cc:
  - packages that are not touched doesn't need to be unpacked

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 7c950292ace11ed299290451cf33a816e800c048..55f9cb9cce8bf9ed2819ceeda3a8e45446bd3f3e 100644 (file)
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -117,7 +117,8 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg)
       return false;
 
    // Skip Packages that need configure only.
       return false;
 
    // Skip Packages that need configure only.

-   if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && 
+   if ((Pkg.State() == pkgCache::PkgIterator::NeedsConfigure ||
+        Pkg.State() == pkgCache::PkgIterator::NeedsNothing) &&

        Cache[Pkg].Keep() == true)
       return false;
 
        Cache[Pkg].Keep() == true)
       return false;
 

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index eef79cccd381443da9de4a702c4eb555cf9a61ef..49776aac705b505e703e127f3300e1c566134d97 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -602,7 +602,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
       // configured we don't need to unpack it again…
       PkgIterator const P = Pkg.Group().FindPkg("all");
       if (List->IsFlag(P,pkgOrderList::UnPacked) != true &&
       // 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) {
+         List->IsFlag(P,pkgOrderList::Configured) != true &&
+         P.State() != pkgCache::PkgIterator::NeedsNothing) {

         if (SmartUnPack(P) == false)
            return false;
       }
         if (SmartUnPack(P) == false)
            return false;
       }

diff --git a/debian/changelog b/debian/changelog
index 8470a0d853907ae290131d09a979a2cf65bebe02..edea3400a0fef368a5203291848376c08ffc8e34 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ apt (0.7.26~exp7) UNRELEASED; urgency=low
   * apt-pkg/cacheset.cc:
     - get the candidate either from an already built depcache
       or use the policy which is a bit faster than depcache generation
   * apt-pkg/cacheset.cc:
     - get the candidate either from an already built depcache
       or use the policy which is a bit faster than depcache generation

+  * apt-pkg/orderlist.cc:
+    - untouched packages are never missing
+  * apt-pkg/packagemanager.cc:
+    - packages that are not touched doesn't need to be unpacked

 
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 10 Jun 2010 13:04:47 +0200
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 10 Jun 2010 13:04:47 +0200