From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 21 Mar 2009 01:24:30 +0000 (-0400)
Subject: pass -N into DH_INTERNAL_OPTIONS
X-Git-Tag: 7.2.7~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ef2f1236c3608089934726e3769cea51fc301c17;p=debhelper.git

pass -N into DH_INTERNAL_OPTIONS

I think I didn't do this before because it could result in
parseoptions() erroring because there were no packages to act on.
That is not going to be an error soon though, and it makes sense to
pass in the -N excludes.
---

diff --git a/dh b/dh
index 498c7cf..8639ed0 100755
--- a/dh
+++ b/dh
@@ -443,6 +443,10 @@ sub run {
 	my @exclude=@{shift()};
 	my @options=@_;
 	
+	# If some packages are excluded, add flags
+	# to prevent them from being acted on.
+	push @options, map { "-N$_" } @exclude;
+
 	# Check for override targets in debian/rules and
 	# run them instead of running the command directly.
 	my $override_command;
@@ -454,11 +458,6 @@ sub run {
 		$command="debian/rules";
 		@options="override_".$override_command;
 	}
-	else {
-		# If some packages are excluded, add flags
-		# to prevent them from being acted on.
-		push @options, map { "-N$_" } @exclude;
-	}
 
 	# 3 space indent lines the command being run up under the 
 	# sequence name after "dh ".