Dpkg::ErrorHandling: New syntaxerr function

diff --git a/ChangeLog b/ChangeLog
index 4243fd9a06ca2a7780619cb8d3850e835b9da03a..f810fc13ac1361bc3e31958498785858d8d2535d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,11 @@
        * dselect/baselist.cc (baselist::startdisplay): Set helpscreen_attr
        on monochrome terminals.
 
+2007-12-28  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/ErrorHandling.pm (syntaxerr): New function to
+       replace the syntax() function in controllib.pl.
+
 2007-12-28  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg.pm: Add a warning to avoid adding unnecessary stuff

diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index 53bd45dfe26c080ca49bfbda6229c742b369c4b6..9d79f2831e7585a1bb6e66bab6ca7e02c9c33571 100644 (file)
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -5,7 +5,7 @@ use Dpkg::Gettext;
 
 use base qw(Exporter);
 our @EXPORT_OK = qw(warning warnerror error failure unknown syserr internerr
-                    subprocerr usageerr $warnable_error $quiet_warnings);
+                    subprocerr usageerr syntaxerr $warnable_error $quiet_warnings);
 
 our $warnable_error = 1;
 our $quiet_warnings = 0;
@@ -89,4 +89,9 @@ sub usageerr(@)
     exit(2);
 }
 
+sub syntaxerr {
+    my ($file, $msg) = @_;
+    error(_g("syntax error in %s at line %d: %s"), $file, $., $msg);
+}
+
 1;