[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-270-g89973c5

[Guillem Jover]

The following commit has been merged in the master branch:
commit 62449a0a27ab1231ed81267f7ee5421b9f7fcb0c
Author: Guillem Jover <guil...@debian.org>
Date:   Sun Aug 14 23:45:36 2011 +0200

    Expand numeric literals and word abbreviation in usage error output
    
    This avoids unneeded abbreviations, uses correct english, and should
    help translators.

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index df900a0..35c2d86 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -155,7 +155,7 @@ sub load_override_extra
 usage() and exit 1 if not $result;
 
 if (not @ARGV >= 1 && @ARGV <= 3) {
-    usageerr(_g("1 to 3 args expected"));
+    usageerr(_g("one to three arguments expected"));
 }
 
 my $type = defined($options{type}) ? $options{type} : 'deb';
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 8c4e46d..777fec3 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -299,7 +299,7 @@ sub main {
     my (@out);
 
     GetOptions(@Option_spec) or usage;
-    @ARGV >= 1 && @ARGV <= 3 or usageerr(_g("1 to 3 args expected\n"));
+    @ARGV >= 1 && @ARGV <= 3 or usageerr(_g("one to three arguments 
expected"));
 
     push @ARGV, undef          if @ARGV < 2;
     push @ARGV, ''             if @ARGV < 3;

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