From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Fri, 28 Mar 2008 15:11:01 +0000 (+0200)
Subject: Improve depisok error message when the package involved is installed
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc4f9f334266fbe1535856438eb0ceda99c9e77;p=dpkg

Improve depisok error message when the package involved is installed
---

diff --git a/ChangeLog b/ChangeLog
index 5adc162f..d0a91f81 100644
--- 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 30e59366..3014ae86 100644
--- 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);