From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 8 Jun 2007 23:34:26 +0000 (+0200)
Subject: * merged some more missing bits
X-Git-Tag: 0.7.21~277^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/468126e3030ac3db47e4c7d361badf99c338fdf4?ds=sidebyside

* merged some more missing bits
---

468126e3030ac3db47e4c7d361badf99c338fdf4
diff --cc apt-pkg/depcache.cc
index ac667d51d,4794d3503..af2fd54c7
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -238,6 -243,6 +240,9 @@@ bool pkgDepCache::writeStateFile(OpProg
  	       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 --cc cmdline/apt-mark
index dadc01366,728f083dc..fdc3e1856
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@@ -60,5 -60,5 +60,6 @@@ if __name__ == "__main__"
              else:
                  outfile.write(str(tagfile.Section)+"\n")
          # all done, rename the tmpfile
 +        os.chmod(outfile.name, 0644)
          os.rename(outfile.name, STATE_FILE)
+         os.chmod(outfile.name, 0644)