[debhelper-devel] [debhelper] 01/02: dh: Fix off-by-one in a compat check

[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 62a4c177571afb07202219312d0c79389971d980
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jan 7 09:48:03 2018 +0000

    dh: Fix off-by-one in a compat check
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 9 +++++++++
 dh               | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49afe01..fed3e6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (11.1.1) UNRELEASED; urgency=medium
+
+  * dh: Fix an off-by-one in a compat check.  This fixes an
+    internal error for compat 9 packages that requires dh to
+    recurse into the debian/rules file.  Thanks to Helmut
+    Grohne for reporting the bug.  (Closes: #886518)
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 07 Jan 2018 09:17:16 +0000
+
 debhelper (11.1) unstable; urgency=medium
 
   [ Paul Tagliamonte ]
diff --git a/dh b/dh
index e123ed0..7e5322e 100755
--- a/dh
+++ b/dh
@@ -687,12 +687,12 @@ if ( -f $build_stamp_file and not compat(9)) {
 	$completed_sequences{'build'} = 1 if $build_indep_target_done and $build_arch_target_done;
 }
 
-# In compat <= 9, the sequences are always inlined (those versions do not
-# recurse into debian/rules anyway).  In compat 10+, we never inline an
+# In compat <= 8, the sequences are always inlined (those versions do not
+# recurse into debian/rules anyway).  In compat 9+, we never inline an
 # existing rules target.
 my ($rules_targets, $full_sequence) = optimize_sequence(\%sequences,
 														$sequence,
-														(!compat(9) ? 0 : 1),
+														(!compat(8) ? 0 : 1),
 														\%completed_sequences
 														);
 my $stoppoint = $#{$full_sequence};

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