In v8 mode, do not allow directly passing unknown options to debhelper commands. (Unknown options in DH_OPTIONS still only result in warnings.)

2 files changed, 4 insertions, 3 deletions

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index da145371..257fe649 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -218,8 +218,9 @@ sub parseopts {
 
 	my $ret=getoptions(\@ARGV, %params);
 	if (!$ret) {
-		warning("warning: unknown options will be a fatal error in a future debhelper release");
-		#error("unknown option; aborting");
+		if (! compat(7)) {
+			error("unknown option; aborting");
+		}
 	}
 
 	# Check to see if -V was specified. If so, but no parameters were
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 09ec0b14..63d1f657 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -19,7 +19,7 @@ use vars qw(@ISA @EXPORT %dh);
 	    &sourcepackage
 	    &is_make_jobserver_unavailable &clean_jobserver_makeflags);
 
-my $max_compat=7;
+my $max_compat=8;
 
 sub init {
 	my %params=@_;