From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 27 May 2009 19:29:27 +0000 (+0200)
Subject: Make it work with set -u
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d2b86f9ba8e3c99e4e0e053fd2c8a4310070552f;p=mirror%2Fdsa-puppet.git

Make it work with set -u
---

diff --git a/modules/geodns/files/common/recvconf b/modules/geodns/files/common/recvconf
index 36f957343..e124e7139 100755
--- a/modules/geodns/files/common/recvconf
+++ b/modules/geodns/files/common/recvconf
@@ -94,7 +94,14 @@ copy_and_runcommands() {
 
 IN=0
 linenum=0
+file=""
 nextfile=""
+
+clear_vars() {
+	perms=""; user=""; group=""; precommand=""; postcommand=""
+}
+clear_vars
+
 while read line; do
     linenum="$(($linenum + 1))"
 
@@ -120,7 +127,7 @@ while read line; do
 	## the file, then set a $file to the new value and continue parsing.
 	[ -n "$file" ] && copy_and_runcommands "$file" "$perms" "$user" "$group" "$precommand" "$postcommand"
 	file="$(printf "%s" "$line" | sed -e 's/[[:space:]]*file[[:space:]]\+\([^[:space:]#]*\).*/\1/')"
-	perms=""; user=""; group=""; precommand=""; postcommand=""
+	clear_vars
 	continue
     fi