Author: guillem
Date: 2006-03-05 20:31:21 +0000 (Sun, 05 Mar 2006)
New Revision: 193
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/controllib.pl.in
trunk/scripts/dpkg-source.pl
Log:
Add new quiet option to dpkg-source to supress warnings. Closes: #355065
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-03-05 19:24:27 UTC (rev 192)
+++ trunk/ChangeLog 2006-03-05 20:31:21 UTC (rev 193)
@@ -1,5 +1,11 @@
2006-03-05 Guillem Jover <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
+
* debian/control (Build-Depends): Do not depend on libselinux1-dev
in GNU/kFreeBSD amd64.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-03-05 19:24:27 UTC (rev 192)
+++ trunk/debian/changelog 2006-03-05 20:31:21 UTC (rev 193)
@@ -15,6 +15,7 @@
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
Modified: trunk/scripts/controllib.pl.in
===================================================================
--- trunk/scripts/controllib.pl.in 2006-03-05 19:24:27 UTC (rev 192)
+++ trunk/scripts/controllib.pl.in 2006-03-05 20:31:21 UTC (rev 193)
@@ -26,6 +26,7 @@
$substvar{'Tab'}= "\t";
$maxsubsts=50;
$warnable_error= 1;
+$quiet_warnings = 0;
$progname= $0; $progname= $& if $progname =~ m,[^/]+$,;
@@ -456,7 +457,7 @@
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( @_ ); } }
Modified: trunk/scripts/dpkg-source.pl
===================================================================
--- trunk/scripts/dpkg-source.pl 2006-03-05 19:24:27 UTC (rev 192)
+++ trunk/scripts/dpkg-source.pl 2006-03-05 20:31:21 UTC (rev 193)
@@ -72,6 +72,7 @@
-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 @@
$warnable_error= 1;
} elsif (m/^-E$/) {
$warnable_error= 0;
+ } elsif (m/^-q$/) {
+ $quiet_warnings = 1;
} elsif (m/^--$/) {
last;
} else {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
