Просмотр исходного кода

* apt-pkg/depcache.{cc,h}:
- added OnlyInstalled option to writeState()
* debian/changelog:
- prepared nwe upload

Michael Vogt лет назад: 20
Родитель
Сommit
95689ededb
3 измененных файлов с 7 добавлено и 3 удалено
  1. 4 1
      apt-pkg/depcache.cc
  2. 1 1
      apt-pkg/depcache.h
  3. 2 1
      debian/changelog

+ 4 - 1
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;

+ 1 - 1
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;};

+ 2 - 1
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