[SCM] dpkg's main repository branch, master, updated. 1.14.23-209-gd1cea90

[Guillem Jover]

The following commit has been merged in the master branch:
commit d1cea90edc826a095ed7c86f1eb5655dd4dc1707
Author: Guillem Jover <guil...@debian.org>
Date:   Mon Jan 5 00:55:44 2009 +0200

    dpkg: Use warning function instead of hand crafted fprintf call

diff --git a/ChangeLog b/ChangeLog
index 44c5122..4c10348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-01-05  Guillem Jover  <guil...@debian.org>
 
+       * src/main.c (setobsolete): Use warning instead of fprintf call.
+       (setforce): Likewise.
+
+2009-01-05  Guillem Jover  <guil...@debian.org>
+
        * man/start-stop-daemon.8: Clarify that the signal sent by default
        is TERM not KILL.
 
diff --git a/src/main.c b/src/main.c
index 129e54c..c892af3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -216,7 +216,7 @@ static void setaction(const struct cmdinfo *cip, const char 
*value) {
 }
 
 static void setobsolete(const struct cmdinfo *cip, const char *value) {
-  fprintf(stderr, _("Warning: obsolete option `--%s'\n"),cip->olong);
+  warning(_("obsolete option '--%s'\n"), cip->olong);
 }
 
 static void setdebug(const struct cmdinfo *cpi, const char *value) {
@@ -374,8 +374,7 @@ static void setforce(const struct cmdinfo *cip, const char 
*value) {
       if (fip->opt)
        *fip->opt= cip->arg;
       else
-       fprintf(stderr, _("Warning: obsolete force/refuse option `%s'\n"),
-               fip->name);
+       warning(_("obsolete force/refuse option '%s'\n"), fip->name);
     }
     if (!comma) break;
     value= ++comma;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org