[debhelper-devel] [debhelper] 02/03: dh: Avoid reset of starting point with multiple opaque targets

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit d0cd645924fd6834d049dd3d4d156c93a2e29a0c
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jan 4 19:14:28 2018 +0000

    dh: Avoid reset of starting point with multiple opaque targets
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dh b/dh
index d6ba0c4..e123ed0 100755
--- a/dh
+++ b/dh
@@ -758,7 +758,16 @@ for my $rules_command (@{$rules_targets}) {
 		COMMAND: for my $c (reverse(@{$seq})) {
 			for my $j (0 .. $#{$full_sequence}) {
 				if ($c eq $full_sequence->[$j]) {
-					$startpoint{$package} = $j + 1;
+					# Unfortunately, we do not guarantee any order
+					# between the run targets.  Assuming e.g.
+					# "install-arch" and "build" are opague targets
+					# then we could process "install-arch" first and
+					# then "build".  In this case, it is important
+					# that we do not "reset" the starting point for
+					# "arch" packages.  Otherwise, we might repeat
+					# part of the "install-arch" sequence when we
+					# should not.
+					$startpoint{$package} = $j + 1 if $j + 1 > startpoint{$package};
 					last COMMAND;
 				}
 			}

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