[devscripts] 13/18: debuild: Pass --check-(command|option) to dpkg-buildpackage

[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 58eb4a4a5e006bf9a2589da0ef2f36aa0d81ed8c
Author: James McCoy <jamessan at debian.org>
Date:   Sun Nov 20 16:58:53 2016 -0500

    debuild: Pass --check-(command|option) to dpkg-buildpackage
    
    If lintian is intended to be run, tell dpkg-buildpackage to do so using
    the --check-command/--check-options flags.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/debuild.pl | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 4022832..6bfa0b7 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -174,7 +174,6 @@ my $preserve_env=0;
 my %save_vars;
 my $root_command='';
 my $run_lintian=1;
-my $lintian_exists=0;
 my @dpkg_extra_opts=();
 my @lintian_extra_opts=();
 my @lintian_opts=();
@@ -707,12 +706,6 @@ if ($command_version eq 'dpkg') {
 
     # Our first task is to parse the command line options.
 
-    # And before we get too excited, does lintian even exist?
-    if ($run_lintian) {
-	system("command -v lintian >/dev/null 2>&1") == 0
-	    and $lintian_exists=1;
-    }
-
     # dpkg-buildpackage variables explicitly initialised in dpkg-buildpackage
     my $signsource=1;
     my $signchanges=1;
@@ -966,6 +959,10 @@ if ($command_version eq 'dpkg') {
     if (defined($checkbuilddep)) {
 	unshift @dpkg_opts, ($checkbuilddep ? "-D" : "-d");
     }
+    if ($run_lintian) {
+	push(@dpkg_opts, '--check-command=lintian',
+	    map { "--check-option=$_" } @lintian_opts);
+    }
     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