[devscripts] 01/18: debuild: Remove handling of obsolete -W/-E options

James McCoy jamessan at debian.org
Wed Nov 23 18:11:31 UTC 2016


This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 80dbba4d6deedb25ccb980547803d3f7e7ba88a4
Author: James McCoy <jamessan at debian.org>
Date:   Wed Sep 16 22:46:42 2015 -0400

    debuild: Remove handling of obsolete -W/-E options
    
    dpkg-buildpackage turned -W/-E into deprecated, no-op options in 2009
    (c.f., 288aa90e).  There's no need to explicitly support them in debuild
    anymore.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/debuild.pl | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 5776198..2bd6531 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -767,9 +767,6 @@ if ($command_version eq 'dpkg') {
     my $parallel='';
     my $noclean=0;
     my $usepause=0;
-    my $warnable_error=0;  # OK, dpkg-buildpackage defines this but doesn't
-                           # use it.  We'll keep it around just in case it
-                           # does one day...
     my @passopts=();
 
     # extra dpkg-buildpackage variables not initialised there
@@ -830,10 +827,6 @@ if ($command_version eq 'dpkg') {
 	    push(@dpkg_opts, $_), next;
 	/^-C(.*)/ and $desc=$1, push(@dpkg_opts, $_), next;
 	/^-j(auto|\d*)$/ and $parallel=($1 || '-1'), push(@dpkg_opts, $_), next;
-	$_ eq '-W' and $warnable_error=1, push(@passopts, $_),
-	    push(@dpkg_opts, $_), next;
-	$_ eq '-E' and $warnable_error=0, push(@passopts, $_),
-	    push(@dpkg_opts, $_), next;
 	# dpkg-cross specific option
 	if (/^-M/ and $dpkg_cross) { push(@dpkg_opts, $_), next; }
 	if ($emulate_dpkgbp) {
@@ -882,10 +875,6 @@ if ($command_version eq 'dpkg') {
 	    push(@dpkg_opts, $_), next;
 	/^-C(.*)/ and $desc=$1, push(@dpkg_opts, $_), next;
 	/^-j(auto|\d*)$/ and $parallel=($1 || '-1'), push(@dpkg_opts, $_), next;
-	$_ eq '-W' and $warnable_error=1, push(@passopts, $_),
-	    push(@dpkg_opts, $_), next;
-	$_ eq '-E' and $warnable_error=0, push(@passopts, $_),
-	    push(@dpkg_opts, $_), next;
 	# dpkg-cross specific option
 	if (/^-M/ and $dpkg_cross) { push(@dpkg_opts, $_), next; }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git



More information about the devscripts-devel mailing list