Add new quiet option to dpkg-source to supress warnings. Closes: #355065

diff --git a/ChangeLog b/ChangeLog
index 7058648bd96d16dd8f8e0203587558015335087f..c69f91acaea5f3699a30145a79993ec5d4b8d535 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05  Guillem Jover  <guillem@debian.org>
+
+       * scripts/controllib.pl.in (quiet_warnings): New variable.
+       (warn): Do not print if quiet_warnings.
+       * dpkg-source.pl (usageversion): Document new option `-q'.
+
 2006-03-05  Guillem Jover  <guillem@debian.org>
 
        * debian/control (Build-Depends): Do not depend on libselinux1-dev

diff --git a/debian/changelog b/debian/changelog
index baad5ea0cdd03bd2d5bba05fd703e2597c31c7e6..052649aa6f01a2e092258ab25bf1f99d2735705b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ dpkg (1.13.17~) UNRELEASED; urgency=low
     attributes and other embellishments.
   * Add dpkg-query(1) in the SEE ALSO section in dpkg(1). Closes: #354643
   * Don't try to compile in SELinux support on GNU/kFreeBSD amd64.
+  * Add new quiet option to dpkg-source to supress warnings. Closes: #355065
 
   [ Updated man pages translations ]
   * Polish (Robert Luberda). Closes: #353782

diff --git a/scripts/controllib.pl.in b/scripts/controllib.pl.in
index eed7395819c80d93c131cac0503511486db40407..794cc34ddf78efdf3e0db083133ead716d3082f0 100755 (executable)
--- a/scripts/controllib.pl.in
+++ b/scripts/controllib.pl.in
@@ -26,6 +26,7 @@ $substvar{'Space'}= " ";
 $substvar{'Tab'}= "\t";
 $maxsubsts=50;
 $warnable_error= 1;
+$quiet_warnings = 0;
 
 $progname= $0; $progname= $& if $progname =~ m,[^/]+$,;
 
@@ -456,7 +457,7 @@ sub failure { die "$progname: failure: $_[0]\n"; }
 sub syserr { die "$progname: failure: $_[0]: $!\n"; }
 sub error { die "$progname: error: $_[0]\n"; }
 sub internerr { die "$progname: internal error: $_[0]\n"; }
-sub warn { warn "$progname: warning: $_[0]\n"; }
+sub warn { if (!$quiet_warnings) { warn "$progname: warning: $_[0]\n"; } }
 sub usageerr { print(STDERR "$progname: @_\n\n"); &usageversion; exit(2); }
 sub warnerror { if ($warnable_error) { &warn( @_ ); } else { &error( @_ ); } }
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index babe7902a1a2b43cdb4040ee9821c58a32f15ba1..35d547f82639b725bc1101bff0c6476c2db1c0e7 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -72,6 +72,7 @@ Build options:   -c<controlfile>     get control info from this file
                  -U<field>           remove a field
                  -W                  Turn certain errors into warnings. 
                  -E                  When -W is enabled, -E disables it.
+                 -q                  quiet operation, do not print warnings.
                  -sa                 auto select orig source (-sA is default)
                  -i[<regexp>]        filter out files to ignore diffs of.
                                      Defaults to: '$diff_ignore_default_regexp'
@@ -137,6 +138,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
         $warnable_error= 1;
     } elsif (m/^-E$/) {
         $warnable_error= 0;
+    } elsif (m/^-q$/) {
+        $quiet_warnings = 1;
     } elsif (m/^--$/) {
         last;
     } else {