Improve depisok error message when the package involved is installed

diff --git a/ChangeLog b/ChangeLog
index 5adc162f7eae5b5fad643359daa5d031b30a2bff..d0a91f81269002cd6f2af45555c32c3f2e0a7bbf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-28  Ian Jackson  <ian@davenant.greenend.org.uk>
+
+       * src/depcon.c (depisok): Improve whynot message by stating when a
+       package is installed with 'is present'.
+
 2008-03-28  Ian Jackson  <ian@davenant.greenend.org.uk>
 
        * src/help.c (cu_post_script_tasks): New function.

diff --git a/src/depcon.c b/src/depcon.c
index 30e59366c15856fd58cacc3d460a8e399e83da71..3014ae864cda98a0b80c8d651ee74f477caf0c4b 100644 (file)
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -422,7 +422,7 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
           if (dep->type == dep_breaks) break; /* no problem */
         case stat_installed:
           if (!versionsatisfied(&possi->ed->installed, possi)) break;
-          sprintf(linebuf, _("  %.250s (version %.250s) is %s.\n"),
+          sprintf(linebuf, _("  %.250s (version %.250s) is present and %s.\n"),
                   possi->ed->name,
                   versiondescribe(&possi->ed->installed.version,vdew_nonambig),
                   gettext(statusstrings[possi->ed->status]));
@@ -484,7 +484,8 @@ int depisok(struct dependency *dep, struct varbuf *whynot,
           case stat_halfconfigured:
             if (dep->type == dep_breaks) break; /* no problem */
           case stat_installed:
-            sprintf(linebuf, _("  %.250s provides %.250s and is %s.\n"),
+            sprintf(linebuf,
+                    _("  %.250s provides %.250s and is present and %s.\n"),
                     provider->up->up->name, possi->ed->name,
                     gettext(statusstrings[provider->up->up->status]));
             varbufaddstr(whynot, linebuf);