[devscripts] 01/01: debuild: Clear @ARGV when running lintian

[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 452366d80b7ace6727bc18b1bf44311af4afaa05
Author: James McCoy <jamessan at debian.org>
Date:   Sat Dec 3 19:10:02 2016 -0500

    debuild: Clear @ARGV when running lintian
    
    If --lintian-opts is seen, the remaining elements in @ARGV are arguments
    for lintian.  @ARGV therefore needs to be cleared so subsequent code
    doesn't think it should be treating @ARGV as targets for debian/rules.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog   | 2 ++
 scripts/debuild.pl | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9272c9a..f34511b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ devscripts (2.16.11) UNRELEASED; urgency=medium
   [ James McCoy ]
   * debuild:
     + Avoid setting a hook to just "cd ..; ".
+    + Clear @ARGV if running lintian to avoid treating @ARGV as debian/rules
+      targets to run.  (Closes: #846863)
 
   [ Antonio Terceiro ]
   * debclean:
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 9f91719..639bbac 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -877,6 +877,7 @@ if (@ARGV) {
 	}
 	shift;
 	push(@lintian_opts, @ARGV);
+	undef @ARGV;
     }
 }
 

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