From 69e898ae9f320e1bf812622e98c92f6949853b6e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Jun 2009 00:27:04 -0400 Subject: Allow command-specific options to be passed to commands via dh without causing other commands to emit a getopt warning or deprecation message. --- Debian/Debhelper/Dh_Getopt.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Debian/Debhelper/Dh_Getopt.pm') diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 5585a54c..864b168e 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -155,11 +155,12 @@ sub parseopts { $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//; $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//; @ARGV_extra=split(/\s+/,$ENV{DH_INTERNAL_OPTIONS}); - my $ret=getoptions(\@ARGV_extra, $options); - if (!$ret) { - warning("warning: unknown options will be a fatal error in a future debhelper release"); - #error("unknown option; aborting"); - } + + # Unknown options will be silently ignored. + my $oldwarn=$SIG{__WARN__}; + $SIG{__WARN__}=sub {}; + getoptions(\@ARGV_extra, $options); + $SIG{__WARN__}=$oldwarn; # Avoid forcing acting on packages specified in # DH_INTERNAL_OPTIONS. This way, -p can be specified -- cgit v1.2.3