瀏覽代碼

Comment new suggest/recommend behaviour in dselect - it's broken

Wichert Akkerman 26 年之前
父節點
當前提交
c613f44410
共有 4 個文件被更改,包括 13 次插入5 次删除
  1. 5 0
      ChangeLog
  2. 1 1
      debian/emacsen-common-install
  3. 1 1
      debian/emacsen-common-remove
  4. 6 3
      dselect/pkgdepcon.cc

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Tue Dec  7 01:26:21 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Commend changes made in pkgdepcon.cc; they're not completely
+    correct yet
+
 Mon Dec  6 01:37:08 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Correct uid/gid-changes in start-stop-daemon, patch from

+ 1 - 1
debian/emacsen-common-install

@@ -2,7 +2,7 @@
 set -e
 
 FLAVOR=$1
-PACKAGE=dpkg-dev
+PACKAGE=dpkg
 
 ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
 ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}

+ 1 - 1
debian/emacsen-common-remove

@@ -2,7 +2,7 @@
 set -e
 
 FLAVOR=$1
-PACKAGE=dpkg-dev
+PACKAGE=dpkg
 
 if [ ${FLAVOR} != emacs ]; then
   echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}

+ 6 - 3
dselect/pkgdepcon.cc

@@ -221,10 +221,13 @@ int packagelist::resolvedepcon(dependency *depends) {
   case dep_provides:
   case dep_replaces:
     return 0;
-    
+
+  case dep_enhances:
+    return 0;
+
   case dep_suggests:
   case dep_recommends:
-
+#if 0
     if (would_like_to_install(depends->up->clientdata->selected,depends->up) <= 0)
       return 0;
 
@@ -260,7 +263,7 @@ int packagelist::resolvedepcon(dependency *depends) {
     r= add(depends, depends->type == dep_suggests ? dp_may : dp_must);
 
     return r;
-
+#endif
   case dep_depends:
   case dep_predepends: