Wichert Akkerman лет назад: 25
Родитель
Сommit
1d0010d0b0
2 измененных файлов с 8 добавлено и 3 удалено
  1. 5 0
      ChangeLog
  2. 3 3
      lib/dump.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Mon May  7 23:04:55 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/dump.c: break up an assertion so it is easier to figure out what
+    went wrong.
+
 Sun May  6 13:20:07 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * main/archives.c: add safe_read() to read from a pipe and deal

+ 3 - 3
lib/dump.c

@@ -131,9 +131,9 @@ void w_status(struct varbuf *vb,
               const struct pkginfo *pigp, const struct pkginfoperfile *pifp,
               const struct fieldinfo *fip) {
   if (pifp != &pigp->installed) return;
-  assert(pigp->want <= want_purge &&
-         pigp->eflag <= eflagv_reinstreq && /* hold and hold-reinstreq NOT allowed */
-         pigp->status <= stat_configfiles);
+  assert(pigp->want <= want_purge);
+  assert(pigp->eflag <= eflagv_reinstreq); /* hold and hold-reinstreq NOT allowed */
+  assert(pigp->status <= stat_configfiles);
   varbufaddstr(vb,"Status: ");
   varbufaddstr(vb,wantinfos[pigp->want].name); varbufaddc(vb,' ');
   varbufaddstr(vb,eflaginfos[pigp->eflag].name); varbufaddc(vb,' ');