Quellcode durchsuchen

More enhances updates

Wichert Akkerman vor 27 Jahren
Ursprung
Commit
0d1523b77d
4 geänderte Dateien mit 11 neuen und 3 gelöschten Zeilen
  1. 1 0
      dselect/pkgdisplay.cc
  2. 2 1
      include/dpkg-db.h
  3. 3 1
      main/depcon.c
  4. 5 1
      main/processarc.c

+ 1 - 0
dselect/pkgdisplay.cc

@@ -72,6 +72,7 @@ const char
 			    N_("conflicts with"),
 			    N_("provides"),
 			    N_("replaces"),
+			    N_("enhances"),
 			    0 },
 
   *const priorityabbrevs[]=  { N_("Req"),

+ 2 - 1
include/dpkg-db.h

@@ -38,7 +38,8 @@ enum deptype {
   dep_predepends,
   dep_conflicts,
   dep_provides,
-  dep_replaces
+  dep_replaces,
+  deb_enhances
 };
 
 enum depverrel {

+ 3 - 1
main/depcon.c

@@ -133,6 +133,7 @@ void describedepcon(struct varbuf *addto, struct dependency *dep) {
   case dep_predepends:  varbufaddstr(addto, _(" pre-depends on ")); break;
   case dep_recommends:  varbufaddstr(addto, _(" recommends "));     break;
   case dep_conflicts:   varbufaddstr(addto, _(" conflicts with ")); break;
+  case dep_enhances:    varbufaddstr(addto, _(" enhances "));       break;
   default:              internerr("unknown deptype");
   }
   varbufdependency(addto, dep);
@@ -162,7 +163,8 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
   char linebuf[1024];
 
   assert(dep->type == dep_depends || dep->type == dep_predepends ||
-         dep->type == dep_conflicts || dep->type == dep_recommends);
+         dep->type == dep_conflicts || dep->type == dep_recommends ||
+		 dep->type == dep_suggests );
   
   /* The dependency is always OK if we're trying to remove the depend*ing*
    * package.

+ 5 - 1
main/processarc.c

@@ -227,7 +227,11 @@ void process_archive(const char *filename) {
         }
       }
       break;
-    case dep_suggests: case dep_recommends: case dep_depends: case dep_replaces:
+    case dep_suggests:
+    case dep_recommends:
+    case dep_depends:
+    case dep_replaces:
+    case dep_enhances:
       /* Ignore these here. */
       break;
     case dep_predepends: