* apt-pkg/depcache.{cc,h}:

 - added OnlyInstalled option to writeState()
* debian/changelog:
  - prepared nwe upload

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 15d7bac4397c8c8b3ace996a04673184e8dcbe31..b8c996c58d21d35b59dc95bf952ef43c7ebdd924 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -179,7 +179,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
    return true;
 }
 
-bool pkgDepCache::writeStateFile(OpProgress *prog)
+bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)
 {
    if(_config->FindB("Debug::pkgAutoRemove",false))
       std::clog << "pkgDepCache::writeStateFile()" << std::endl;
@@ -241,6 +241,9 @@ bool pkgDepCache::writeStateFile(OpProgress *prog)
               std::clog << "Skipping already written " << pkg.Name() << std::endl;
            continue;
         }
+        // skip not installed ones if requested
+        if(InstalledOnly && pkg->CurrentVer == 0)
+           continue;
         if(_config->FindB("Debug::pkgAutoRemove",false))
            std::clog << "Writing new AutoInstall: " 
                      << pkg.Name() << std::endl;

diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 5cd5ea354fa353bf33fb4f7e9738d283f7bb35eb..8f759d345a1f49121267b73fe295d5fe753c64f5 100644 (file)
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -406,7 +406,7 @@ class pkgDepCache : protected pkgCache::Namespace
 
    // read persistent states
    bool readStateFile(OpProgress *prog);
-   bool writeStateFile(OpProgress *prog);
+   bool writeStateFile(OpProgress *prog, bool InstalledOnly=false);
    
    // Size queries
    inline double UsrSize() {return iUsrSize;};

diff --git a/debian/changelog b/debian/changelog
index f98e02b1adfd2c293b61e5cd11deedd1dd8ebb78..5b13362316247ce99c9c368ad23c8142fc2d80fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ apt (0.6.45ubuntu11) edgy; urgency=low
 
   * removed "installtask" and change it so that tasknames can be given
     with "apt-get install taskname^"
+  * improve the writeStateFile() code
 
- -- 
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Sep 2006 14:14:24 +0200
 
 apt (0.6.45ubuntu10) edgy; urgency=low