[devscripts] 07/18: debuild: Track whether -[dD] was explicitly set

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit a2974d71cc63530232cc10f90db80299cbb47810
Author: James McCoy <jamessan at debian.org>
Date:   Sun Nov 20 13:39:50 2016 -0500

    debuild: Track whether -[dD] was explicitly set
    
    This allows us to keep the config file/command line precedence straight
    while also deferring to dpkg-buildpackage's behavior if the user didn't
    specify the option.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/debuild.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 68a132b..fde5631 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -182,7 +182,7 @@ my $lintian_exists=0;
 my @dpkg_extra_opts=();
 my @lintian_extra_opts=();
 my @lintian_opts=();
-my $checkbuilddep=1;
+my $checkbuilddep;
 my $check_dirname_level = 1;
 my $check_dirname_regex = 'PACKAGE(-.+)?';
 my $logging=0;
@@ -995,7 +995,9 @@ if ($command_version eq 'dpkg') {
     open STDERR, ">&BUILD" or fatal "can't reopen stderr: $!";
 
     if (!$emulate_dpkgbp) {
-	unshift @dpkg_opts, ($checkbuilddep ? "-D" : "-d");
+	if (defined($checkbuilddep)) {
+	    unshift @dpkg_opts, ($checkbuilddep ? "-D" : "-d");
+	}
 	unshift @dpkg_opts, "-r$root_command" if $root_command;
 	system_withecho('dpkg-buildpackage', @dpkg_opts);
 

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