From 50a57fe58d8c11c9aee936555b1ecda7200a8070 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Thu, 13 Sep 2018 19:45:08 +0000
Subject: dh: Add hidden ENV variable to test can_skip under --no-act

Signed-off-by: Niels Thykier <niels@thykier.net>
---
 dh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dh')

diff --git a/dh b/dh
index 35ef157c..9b158ead 100755
--- a/dh
+++ b/dh
@@ -874,7 +874,7 @@ foreach my $i (0..$stoppoint) {
 	}
 	next unless @todo;
 
-	next if can_skip($command, @todo) && ! $dh{NO_ACT};
+	next if can_skip($command, @todo);
 
 	# No need to run the command for any packages handled by the
 	# override targets.
@@ -1031,6 +1031,8 @@ my %skipinfo;
 sub can_skip {
 	my ($command, @packages) = @_;
 
+	return 0 if $dh{NO_ACT} and not $ENV{DH_INTERNAL_TEST_CAN_SKIP};
+
 	return 0 if $unoptimizable_user_option ||
 		(exists $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS});
 
-- 
cgit v1.2.3