[SCM] dpkg's main repository branch, master, updated. 1.15.0-120-g170fd06

[Guillem Jover]

The following commit has been merged in the master branch:
commit 289c179ef6d91ad4daec4abff7762d5b17a010c9
Author: Guillem Jover <guil...@debian.org>
Date:   Sun May 10 19:53:08 2009 +0200

    dpkg-vendor: Use usageerr instead of non-existent badusage

diff --git a/scripts/dpkg-vendor.pl b/scripts/dpkg-vendor.pl
index d4c6d29..f010e6e 100755
--- a/scripts/dpkg-vendor.pl
+++ b/scripts/dpkg-vendor.pl
@@ -63,7 +63,7 @@ while (@ARGV) {
     if (m/^--vendor$/) {
         $vendor = shift(@ARGV);
     } elsif (m/^--(is|derives-from|query)$/) {
-        badusage(_g("two commands specified: --%s and --%s"), $1, $action)
+        usageerr(_g("two commands specified: --%s and --%s"), $1, $action)
             if defined($action);
         $action = $1;
         $param = shift(@ARGV);

-- 
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