summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-06-12 00:27:04 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-06-12 00:27:04 -0400
commit69e898ae9f320e1bf812622e98c92f6949853b6e (patch)
treeb03dd5c7e2b9d3f688dfc39a2a76c3bc07835533 /Debian
parent15a4917aa7ccfc33b99fd44ba8eb07ab431f81f7 (diff)
Allow command-specific options to be passed to commands via dh without causing other commands to emit a getopt warning or deprecation message.
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 5585a54..864b168 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