[linux-base] 01/02: linux-check-removal: Fix substitution of package name in debconf title

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux-base.

commit 2b9a7d391f94cc881c3fa120e0a068f0dc174b03
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jun 21 03:44:06 2016 +0100

    linux-check-removal: Fix substitution of package name in debconf title
    
    Substitutions are done immediately in SETTITLE.  To avoid getting a
    stale value, we need to set the 'package' variable first and specify
    that it's to be substituted in the title template.
---
 bin/linux-check-removal | 8 ++++----
 debian/changelog        | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/linux-check-removal b/bin/linux-check-removal
index 5c41239..e2520a3 100755
--- a/bin/linux-check-removal
+++ b/bin/linux-check-removal
@@ -97,6 +97,10 @@ sub check {
 	# debconf only generates a title automatically when used directly
 	# from a maintainer script.  Also, the automatic title says we are
 	# 'configuring' a package but we're not.
+	($ret) = subst($title, 'package', $ENV{DPKG_MAINTSCRIPT_PACKAGE});
+	if ($ret) {
+	    die "Failed to substitute package name in title: $ret";
+	}
 	($ret) = settitle($title);
 	if ($ret) {
 	    die "Failed to set title: $ret";
@@ -109,10 +113,6 @@ sub check {
 	if ($ret) {
 	    die "Failed to reset answer for $question: $ret";
 	}
-	($ret) = subst($question, 'package', $ENV{DPKG_MAINTSCRIPT_PACKAGE});
-	if ($ret) {
-	    die "Failed to substitute package name in title: $ret";
-	}
 	($ret) = subst($question, 'running', $running);
 	if ($ret) {
 	    die "Failed to substitute version in $question: $ret";
diff --git a/debian/changelog b/debian/changelog
index 0228267..92b9a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux-base (4.4) UNRELEASED; urgency=medium
 
   * Update Portugese translation (Closes: 826779; thanks to Américo Monteiro)
+  * linux-check-removal: Fix substitution of package name in debconf title
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 08 Jun 2016 23:18:06 +0100
 

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