--- trunk/mage/usr/lib/mage/depwalker.sh	2013/11/20 12:21:28	2281
+++ trunk/mage/usr/lib/mage/depwalker.sh	2013/12/02 10:11:10	2285
@@ -9,6 +9,14 @@
 	exit 1
 }
 
+decho()
+{
+	if [[ ${DEBUG} = 1 ]]
+	then
+		echo "DEBUG: $@" >&2
+	fi
+}
+
 # include all needed files
 [ -f /etc/mage.rc.global ] &&  \
 	source /etc/mage.rc.global || \
@@ -127,11 +135,9 @@
 
 	DFILE="$1"
 
-	if [[ ${DEBUG} = 1 ]]
-	then
-		echo "DEBUG: depwalking magefile '${DFILE}'" >&2
-		echo >&2
-	fi
+	# debug info
+	decho "depwalking magefile '${DFILE}'"
+	decho
 
 	source ${DFILE}
 
@@ -191,19 +197,14 @@
 
 	if [ -z "${MY_DEPEND}" ]
 	then
-		if [[ ${DEBUG} = 1 ]]
-		then
-			echo "DEBUG: MY_DEPEND is empty; deps of '${DFILE}' ignored" >&2
-		fi
+		decho "MY_DEPEND is empty; deps of '${DFILE}' ignored"
 		return 1
 	fi
 
 	while read SYM DEPNAME
 	do
-		if [[ ${DEBUG} = 1 ]]
-		then
-			echo "DEBUG: DEPNAME='${DEPNAME}'" >&2
-		fi
+		# debug info
+		decho "DEPNAME='${DEPNAME}'"
 
 		# exclude empty depnames
 		[[ -z ${DEPNAME} ]] && continue
@@ -245,10 +246,7 @@
 			then
 				depwalking ${HIGHEST_DEPFILE}
 				ALLDEPS="${ALLDEPS} ${HIGHEST_DEPFILE}"
-				if [[ ${DEBUG} = 1 ]]
-				then
-					echo "DEBUG: added '${HIGHEST_DEPFILE}' to ALLDEPS" >&2
-				fi
+				decho "added '${HIGHEST_DEPFILE}' to ALLDEPS"
 			fi
 		fi
 	done << EOF
@@ -279,23 +277,18 @@
 		# get the highest mage file from mage-db
 		MAGEFILE="$(get_highest_magefile ${PCAT} ${PNAME})"
 
-		if [[ ${DEBUG} = 1 ]]
-		then
-			echo "DEBUG: dep='${dep}'" >&2
-			echo "DEBUG: PCAT='${PCAT}'" >&2
-			echo "DEBUG: PNAME='${PNAME}'" >&2
-			echo "DEBUG: MAGEFILE='${MAGEFILE}'" >&2
-		fi
+		# debug info
+		decho "dep='${dep}'"
+		decho "PCAT='${PCAT}'"
+		decho "PNAME='${PNAME}'"
+		decho "MAGEFILE='${MAGEFILE}'"
 
 		# if no install candidate was found, record this
 		# and process with the next one
 		if [[ -z ${MAGEFILE} ]]
 		then
 			NO_UPGRADE_CANDIDATE="${NO_UPGRADE_CANDIDATE} ${PCAT}/${PNAME}"
-			if [[ ${DEBUG} = 1 ]]
-			then
-				echo "DEBUG: added to NO_UPGRADE_CANDIDATE" >&2
-			fi
+			decho "added to NO_UPGRADE_CANDIDATE"
 			continue
 		fi
 
@@ -303,11 +296,9 @@
 		PVER="$(magename2pver ${MAGEFILE})"
 		PBUILD="$(magename2pbuild ${MAGEFILE})"
 
-		if [[ ${DEBUG} = 1 ]]
-		then
-			echo "DEBUG: PVER='${PVER}'" >&2
-			echo "DEBUG: PBUILD='${PBUILD}'" >&2
-		fi
+		# debug info
+		decho "PVER='${PVER}'"
+		decho "PBUILD='${PBUILD}'"
 
 		# do not walk files which are installed
 		if [ ! -d ${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ]
@@ -319,17 +310,13 @@
 			# (if not exists already)
 			if checklist_alldeps "${MAGEFILE}"
 			then
-				if [[ ${DEBUG} = 1 ]]
-				then
-					echo "DEBUG: added '${MAGEFILE}' to ALLDEPS" >&2
-				fi
+				decho "added '${MAGEFILE}' to ALLDEPS"
 				ALLDEPS="${ALLDEPS} ${MAGEFILE}"
 			fi
 		else
-			if [[ ${DEBUG} = 1 ]]
-			then
-				echo "DEBUG: ignored package" >&2
-				echo >&2
+				# debug info
+				decho "ignored package"
+				decho
 			fi
 		fi
 	done
@@ -350,10 +337,7 @@
 	# (if not exists already)
 	if checklist_alldeps "${MAGEFILE}"
 	then
-		if [[ ${DEBUG} = 1 ]]
-		then
-			echo "DEBUG: added '${MAGEFILE}' to ALLDEPS" >&2
-		fi
+		decho "added '${MAGEFILE}' to ALLDEPS"
 		ALLDEPS="${ALLDEPS} ${MAGEFILE}"
 	fi
 fi