use local scope for private function vars

all vars affected have been carefully checked to be quite certain
that they are definitely local

where variable is assigned the return value of a function/command, the
local "declaration" is deliberately done on a separate line, since
`local FOO` is actually treated itself as a command rather than a
declaration; will thus always cause $? to be zero, and thus if done on
the same line as such an assignment can not only clobber $? but in doing
so unintentionally blocks failure of a command from triggering the
expected exit from having `set -e`.

also, from testing, i have found that when assigning "${@}" this must be
done on a separate line confusingly as otherwise an error occurs.

Gbp-Dch: Short

1 files changed, 7 insertions, 6 deletions

diff --git a/functions/packages.sh b/functions/packages.sh
index f07bed35f..fa16b1161 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -9,11 +9,12 @@
 ## under certain conditions; see COPYING for details.
 
 
+# Note, updates _LB_PACKAGES
 Check_package ()
 {
-	CHROOT="${1}"
-	FILE="${2}"
-	PACKAGE="${3}"
+	local CHROOT="${1}"
+	local FILE="${2}"
+	local PACKAGE="${3}"
 
 	Check_installed "${CHROOT}" "${FILE}" "${PACKAGE}"
 
@@ -68,9 +69,9 @@ Remove_package ()
 #                  2 if package isn't installed and we aren't in an apt managed system
 Check_installed ()
 {
-	CHROOT="${1}"
-	FILE="${2}"
-	PACKAGE="${3}"
+	local CHROOT="${1}"
+	local FILE="${2}"
+	local PACKAGE="${3}"
 
 	if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] && [ "${CHROOT}" = "chroot" ]
 	then