From 0707127c8722d0f3e6ee44ca6ecb86c504a08f56 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Tue, 23 Jun 2015 21:15:17 +0000
Subject: Deprecate the PKGNAME_LOGFILE_EXTENTION conf entry in favour of
 PKGNAME_LOGFILE_EXTENSION to fix the typo

Closes: #693458
---
 pbuilder-buildpackage | 2 +-
 pbuilder-checkparams  | 6 ++++++
 pbuilder-loadconfig   | 7 +++++++
 pbuilder.8            | 2 +-
 pbuilderrc            | 2 +-
 pbuilderrc.5          | 2 +-
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index d434a43..afa1ccf 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -97,7 +97,7 @@ fi
 
 if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then
     if [ "${PKGNAME_LOGFILE}" = "yes" ]; then
-	PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)"${PKGNAME_LOGFILE_EXTENTION}"
+	PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/"$(basename "${PACKAGENAME}" .dsc)"${PKGNAME_LOGFILE_EXTENSION}"
 	exec > >(tee "${PBUILDER_BUILD_LOGFILE}") 2>&1
 	PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}")
 	log "I: Using pkgname logfile"
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 3cdc48e..07534ba 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -138,6 +138,12 @@ while [ -n "$1" ]; do
 		exit 1
 	    fi
 	    . "$2";
+        # deprecated in v0.216
+        if [ -n "$PKGNAME_LOGFILE_EXTENTION" ] ; then
+            echo "W: The configuration option PKGNAME_LOGFILE_EXTENTION is deprecated in favour of PKGNAME_LOGFILE_EXTENSION. Though, while you have the former set it'll take precedence over the latter."
+            echo "W: PKGNAME_LOGFILE_EXTENTION will be removed at some point, please update your config!"
+            PKGNAME_LOGFILE_EXTENSION="$PKGNAME_LOGFILE_EXTENTION"
+        fi
 	    EXTRA_CONFIGFILE[${#EXTRA_CONFIGFILE[@]}]="$2";
 	    shift; shift; 
 	    ;;
diff --git a/pbuilder-loadconfig b/pbuilder-loadconfig
index 67e7a61..6738021 100644
--- a/pbuilder-loadconfig
+++ b/pbuilder-loadconfig
@@ -30,4 +30,11 @@ for RCFILE in \
 	# log() is not available
 	echo "W: $RCFILE does not exist" >&2
     fi
+    # deprecated in v0.216
+    if [ -n "$PKGNAME_LOGFILE_EXTENTION" ] ; then
+        echo "W: The configuration option PKGNAME_LOGFILE_EXTENTION is deprecated in favour of PKGNAME_LOGFILE_EXTENSION. Though, while you have the former set it'll take precedence over the latter."
+        echo "W: PKGNAME_LOGFILE_EXTENTION will be removed at some point, please update your config!"
+        PKGNAME_LOGFILE_EXTENSION="$PKGNAME_LOGFILE_EXTENTION"
+    fi
 done
+
diff --git a/pbuilder.8 b/pbuilder.8
index 9043a08..4dc079e 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -476,7 +476,7 @@ only really applicable for
 target.
 
 The file extension is specified by 
-.B "PKGNAME_LOGFILE_EXTENTION"
+.B "PKGNAME_LOGFILE_EXTENSION"
 in 
 .B "pbuilderrc"
 
diff --git a/pbuilderrc b/pbuilderrc
index 786219f..cffc34f 100644
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -110,7 +110,7 @@ export SHELL=/bin/bash
 DEBOOTSTRAP="debootstrap"
 
 # default file extension for pkgname-logfile
-PKGNAME_LOGFILE_EXTENTION="_$(dpkg --print-architecture).build"
+PKGNAME_LOGFILE_EXTENSION="_$(dpkg --print-architecture).build"
 
 # default PKGNAME_LOGFILE
 PKGNAME_LOGFILE=""
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 5ad5d86..42065ab 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -299,7 +299,7 @@ The currently possible values are
 and
 .B "cowbuilder"
 .TP
-.BI "PKGNAME_LOGFILE_EXTENTION=" ".build"
+.BI "PKGNAME_LOGFILE_EXTENSION=" "_$(dpkg \-\-print\-architecture).build"
 The extension of filename used in pkgname\-logfile option.
 .TP
 .BI "PKGNAME_LOGFILE=" "yes"
-- 
cgit v1.2.3