浏览代码

* merged from apt--auto-mark

Michael Vogt 19 年之前
父节点
当前提交
3dc863efa5
共有 3 个文件被更改,包括 10 次插入3 次删除
  1. 5 0
      apt-pkg/depcache.cc
  2. 1 1
      configure.in
  3. 4 2
      debian/changelog

+ 5 - 0
apt-pkg/depcache.cc

@@ -1324,6 +1324,11 @@ bool pkgDepCache::Sweep()
   {
      StateCache &state=PkgState[p->ID];
 
+     // skip required packages
+     if (!p.CurrentVer().end() && 
+	 (p.CurrentVer()->Priority == pkgCache::State::Required))
+	continue;
+
      // if it is not marked and it is installed, it's garbage 
      if(!state.Marked && (!p.CurrentVer().end() || state.Install()))
      {

+ 1 - 1
configure.in

@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu3")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

+ 4 - 2
debian/changelog

@@ -1,9 +1,11 @@
-apt (0.6.46.5) unstable; urgency=low
+apt (0.6.46.4ubuntu3) feisty; urgency=low
 
   * apt-pkg/algorithm.cc:
     - use clog for all debugging
+  * apt-pkg/depcache.cc:
+    - never mark Required package for autoremoval (lp: #75882)
 
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Dec 2006 11:56:05 +0100
 
 apt (0.6.46.4ubuntu2) feisty; urgency=low