[SCM] dpkg's main repository branch, master, updated. 1.14.20-128-g1ccfc48

[Guillem Jover]

The following commit has been merged in the master branch:
commit 06c0f32e1036ee3f2a71804a2df32cd6635b5a92
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Tue Aug 5 06:26:27 2008 +0300

    dpkg-scanpackages: Use usageerr instead of embedded code

diff --git a/ChangeLog b/ChangeLog
index fe02b3c..5e922f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-08-05  Guillem Jover  <[EMAIL PROTECTED]>
 
+       * scripts/dpkg-scanpackages.pl: Use usageerr instead of embedded code.
+
+2008-08-05  Guillem Jover  <[EMAIL PROTECTED]>
+
        * scripts/dpkg-distaddfile.pl: Use _g() instead of wrong and typoed
        gettetx().
 
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 9211e03..511a343 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -7,7 +7,7 @@ use IO::Handle;
 use IO::File;
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(error syserr subprocerr);
+use Dpkg::ErrorHandling qw(error syserr usageerr subprocerr);
 use Dpkg::Deps qw(@pkg_dep_fields);
 use Dpkg::Version qw(compare_versions);
 
@@ -112,9 +112,7 @@ sub load_override
 usage() and exit 1 if not $result;
 
 if (not @ARGV >= 1 && @ARGV <= 3) {
-    warn _g("1 to 3 args expected\n");
-    usage();
-    exit 1;
+    usageerr(_g("1 to 3 args expected"));
 }
 
 my $type = defined($options{type}) ? $options{type} :

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]