From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Mar 2009 15:39:13 +0000 (+0100)
Subject: Renamed variables of pkg_info() because of a namespace conflict.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e8c837566a679c48f6eeded224d0cbfcace4d63;p=ipfire-3.x.git

Renamed variables of pkg_info() because of a namespace conflict.
---

diff --git a/lfs/Config b/lfs/Config
index ad9073269..cf098471d 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -90,19 +90,19 @@ PYTHON_COMPILE = find /usr/lib/python*/ -name *.py | xargs /usr/bin/py-compile
 
 define DO_PKG_INFO
 	@## ALPHABETICAL ORDER ##
-	@echo "local DEBUG=\"$(DEBUG)\""
-	@echo "local DEPS=\"$(DEPS)\""
-	@echo "local DESC=\"$(value LONG_DESC)\""
-	@echo "local EXTRA=\"$(EXTRA)\""
-	@echo "local FILES=\"$(objects)\""
-	@echo "local GROUP=\"$(GROUP)\""
-	@echo "local LICENSE=\"$(LICENSE)\""
-	@echo "local MAINTAINER=\"$(MAINTAINER)\""
-	@echo "local NAME=\"$(PKG_NAME)\""
-	@echo "local VERSION=\"$(PKG_VER)\""
-	@echo "local RELEASE=\"$(PKG_REL)\""
-	@echo "local SHORT=\"$(value SHORT_DESC)\""
-	@echo "local URL=\"$(URL)\""
+	@echo "local PKG_DEBUG=\"$(DEBUG)\""
+	@echo "local PKG_DEPS=\"$(DEPS)\""
+	@echo "local PKG_DESC=\"$(value LONG_DESC)\""
+	@echo "local PKG_EXTRA=\"$(EXTRA)\""
+	@echo "local PKG_FILES=\"$(objects)\""
+	@echo "local PKG_GROUP=\"$(GROUP)\""
+	@echo "local PKG_LICENSE=\"$(LICENSE)\""
+	@echo "local PKG_MAINTAINER=\"$(MAINTAINER)\""
+	@echo "local PKG_NAME=\"$(PKG_NAME)\""
+	@echo "local PKG_VER=\"$(PKG_VER)\""
+	@echo "local PKG_REL=\"$(PKG_REL)\""
+	@echo "local PKG_SHORT=\"$(value SHORT_DESC)\""
+	@echo "local PKG_URL=\"$(URL)\""
 endef
 
 define DO_PACKAGE
diff --git a/tools/make-include b/tools/make-include
index 2c2c7a568..cb00d3b34 100644
--- a/tools/make-include
+++ b/tools/make-include
@@ -177,14 +177,14 @@ lfsmakecommoncheck()
 	
 	shift 1
 
-	build_spy package $NAME
+	build_spy package $PKG_NAME
 
-	beautify package "$NAME" "$VERSION" "$*"
+	beautify package "$PKG_NAME" "$PKG_VER" "$*"
 
 	# Script slipped?
 	local i
 	for i in $SKIP_PACKAGE_LIST; do
-		if [ "$i" == "$NAME" ]; then
+		if [ "$i" == "$PKG_NAME" ]; then
 			beautify result SKIP
 			return 1
 		fi
@@ -192,26 +192,26 @@ lfsmakecommoncheck()
 
 	# On debug build, we don't strip
 	if [ "$STAGE" != "toolchain" -a \
-			"$NAME" == "strip" -a "$BUILD_DEBUG" == "1" ]; then
+			"$PKG_NAME" == "strip" -a "$BUILD_DEBUG" == "1" ]; then
 		beautify result SKIP
 		return 1
 	fi
 
 	# Don't create addons?
-	if [ "$EXTRA" == "yes" ] && [ "$BUILD_EXTRAS" == "0" ]; then
+	if [ "$PKG_EXTRA" == "yes" ] && [ "$BUILD_EXTRAS" == "0" ]; then
 			beautify result SKIP
 			return 1
 	fi
 
 	# Don't create debugging tools?
-	if [ "$DEBUG" == "yes" ] && [ "$BUILD_DEBUG" == "0" ]; then
+	if [ "$PKG_DEBUG" == "yes" ] && [ "$BUILD_DEBUG" == "0" ]; then
 			beautify result SKIP
 			return 1
 	fi
 
 	# Searching for dependencies
 	local found message
-	for dep in ${DEPS}; do
+	for dep in $PKG_DEPS; do
 		found=0
 		for package in $PACKAGES_DONE; do
 			if [ "$dep" = "$package" ]; then
@@ -223,7 +223,7 @@ lfsmakecommoncheck()
 	done
 	if [ "$message" != "" ]; then
 		message="Deps are missing: $message"
-		if [ "$EXTRA" = "yes" ]; then
+		if [ "$PKG_EXTRA" = "yes" ]; then
 			echo -ne "${WARN}${message}${NORMAL}"
 			beautify message SKIP
 			return 1
diff --git a/tools/make-interactive b/tools/make-interactive
index af1b855a6..bb13cf183 100644
--- a/tools/make-interactive
+++ b/tools/make-interactive
@@ -282,44 +282,7 @@ package*|pkg)
 			;;
 		info)
 			shift 2
-			format_desc() {
-				MAX_LENGTH=38
-				INPUT=$@
-
-				LINE=""
-				LENGTH=0
-				for word in $INPUT; do
-					LENGTH=$(expr $LENGTH + ${#word})
-					if [ "$LENGTH" -ge "$MAX_LENGTH" ]; then
-						printf "$LINE\n"
-						LINE="              ${word} "
-						LENGTH=${#word}
-					else
-						LINE="$LINE${word} "
-					fi
-					#echo "-- ($word) $LINE"
-				done
-				printf "$LINE\n"
-			}
-			for pkg in $@; do
-				(
-					eval "$(pkg_info ${pkg})"
-					echo    "############################################################"
-					echo -e "# ${CLR_BOLD_RED}PACKAGE INFO${NORMAL}"
-					echo    "############################################################"
-					for val in NAME VERSION RELEASE break GROUP MAINTAINER break URL LICENSE; do
-						if [ "${val}" == "break" ]; then
-							echo "         ----------------------------------------         "
-						else
-							printf "${CLR_BOLD_RED}%-12s${NORMAL}: ${!val}\n" ${val}
-						fi
-					done
-					for val in SHORT DESC; do
-						printf "${CLR_BOLD_RED}%-12s${NORMAL}: " ${val}
-						format_desc ${!val}
-					done
-					)
-			done
+			pkg_info_shell $@
 			;;
 		group*)
 			echo "#### All available groups of packages in ${NAME}-${VERSION} ####"
diff --git a/tools/make-packages b/tools/make-packages
index 68dfde026..8af06d5a9 100644
--- a/tools/make-packages
+++ b/tools/make-packages
@@ -32,11 +32,10 @@ pkg_list_groups_wiki() {
 	for group in $(pkg_list_groups); do
 		echo "===== $group ====="
 		for package in $BASEDIR/lfs/*; do
-			(	unset NAME VERSION
-				eval $(pkg_info ${package})
-				if [ -n "$NAME" ] && [ "$RELEASE" != "-1" ] && [ "$GROUP" = "$group" ]; then
-					[ -n "$VERSION" ] && NAME="${NAME}-${VERSION}"
-					echo "  * [[.:package:$(basename $package)|${NAME}]] - ${SHORT}"
+			(	eval $(pkg_info ${package})
+				if [ -n "$PKG_NAME" ] && [ "$PKG_REL" != "-1" ] && [ "$PKG_GROUP" = "$group" ]; then
+					[ -n "$PKG_VERSION" ] && NAME="${PKG_NAME}-${PKG_VERSION}"
+					echo "  * [[.:package:$(basename $package)|${PKG_NAME}]] - ${PKG_SHORT}"
 				fi
 			)
 		done
@@ -49,11 +48,10 @@ pkg_list_packages() {
 	for i in $BASEDIR/lfs/*; do
 		[ -L "$i" ] && continue
 		package=$(basename $i)
-		(	unset NAME VERSION
-			eval $(pkg_info ${package})
-			if [ -n "$NAME" ] && [ "$RELEASE" != "-1" ]; then
-				printf "  * %-30s" ${NAME}-${VERSION}
-				echo "${SHORT}"
+		(	eval $(pkg_info ${package})
+			if [ -n "$PKG_NAME" ] && [ "$PKG_REL" != "-1" ]; then
+				printf "  * %-30s" ${PKG_NAME}-${PKG_VER}
+				echo "${PKG_SHORT}"
 			fi
 		)
 	done
@@ -65,11 +63,10 @@ pkg_list_packages_wiki() {
 	for i in $BASEDIR/lfs/*; do
 		[ -L "$i" ] && continue
 		package=$(basename $i)
-		(	unset NAME VERSION
-			eval $(pkg_info ${package})
-			if [ -n "$NAME" ] && [ "$RELEASE" != "-1" ]; then
-				[ -n "$VERSION" ] && NAME="${NAME}-${VERSION}"
-				echo "  * [[.:package:$package|${NAME}]] - ${SHORT}"
+		(	eval $(pkg_info ${package})
+			if [ -n "$PKG_NAME" ] && [ "$PKG_REL" != "-1" ]; then
+				[ -n "$PKG_VER" ] && PKG_NAME="${PKG_NAME}-${PKG_VERSION}"
+				echo "  * [[.:package:$package|${PKG_NAME}]] - ${PKG_SHORT}"
 			fi
 		)
 	done
@@ -96,26 +93,24 @@ pkg_info() {
 }
 
 pkg_info_wiki() {
-	(
-		unset NAME VERSION
-		eval $(pkg_info ${1})
+	(	eval $(pkg_info ${1})
 
-		[ "$NAME" = "" ] && exit
+		[ "$PKG_NAME" = "" ] && exit
 
 		# Output everything in wiki format
-		echo "^  $NAME  ^^"
-		echo "| Version:  | $VERSION  |"
-		echo "| Release:  | $RELEASE  |"
-		echo "| Group:  | $GROUP  |"
-		echo "| License:  | $LICENSE  |"
-		echo "| Maintainer:  | $MAINTAINER  |"
-		echo "| Dependencies: | $(for dep in $DEPS; do echo \"[[$dep]]\"; done) |"
-		echo "| $(echo $DESC) ||"
-		echo "| Website:  | $URL  |"
-		if [ "$DEBUG" = "yes" ]; then
+		echo "^  $PKG_NAME  ^^"
+		echo "| Version:  | $PKG_VER  |"
+		echo "| Release:  | $PKG_REL  |"
+		echo "| Group:  | $PKG_GROUP  |"
+		echo "| License:  | $PKG_LICENSE  |"
+		echo "| Maintainer:  | $PKG_MAINTAINER  |"
+		echo "| Dependencies: | $(for dep in $PKG_DEPS; do echo \"[[$dep]]\"; done) |"
+		echo "| $(echo $PKG_DESC) ||"
+		echo "| Website:  | $PKG_URL  |"
+		if [ "$PKG_DEBUG" = "yes" ]; then
 			echo "<color red>This is a debug-package.</color>"
 		fi
-		if [ "$EXTRA" = "yes" ]; then
+		if [ "$PKG_EXTRA" = "yes" ]; then
 			echo "<color green>This is an extra package.</color>"
 		fi
 		echo
@@ -127,18 +122,57 @@ pkg_info_wiki() {
 
 pkg_deps() {
 	(
-		unset NAME VERSION
 		eval $(pkg_info ${1})
-		echo $DEPS
+		echo $PKG_DEPS
 	)
 }
 
 pkg_files() {
 	(
-		unset NAME VERSION
 		eval $(pkg_info ${1})
-		for i in $FILES; do
+		for i in $PKG_FILES; do
 			echo $i
 		done
 	)
 }
+
+function pkg_info_shell() {
+	format_desc() {
+		MAX_LENGTH=38
+		INPUT=$@
+
+		LINE=""
+		LENGTH=0
+		for word in $INPUT; do
+			LENGTH=$(expr $LENGTH + ${#word})
+			if [ "$LENGTH" -ge "$MAX_LENGTH" ]; then
+				printf "$LINE\n"
+				LINE="              ${word} "
+				LENGTH=${#word}
+			else
+				LINE="$LINE${word} "
+			fi
+			#echo "-- ($word) $LINE"
+		done
+		printf "$LINE\n"
+	}
+	for pkg in $@; do
+		(
+			eval "$(pkg_info ${pkg})"
+			echo    "############################################################"
+			echo -e "# ${CLR_BOLD_RED}PACKAGE INFO${NORMAL}"
+			echo    "############################################################"
+			for val in PKG_NAME PKG_VER PKG_REL break PKG_GROUP PKG_MAINTAINER break PKG_URL PKG_LICENSE; do
+				if [ "${val}" == "break" ]; then
+					echo "         ----------------------------------------         "
+				else
+					printf "${CLR_BOLD_RED}%-12s${NORMAL}: ${!val}\n" ${val#PKG_}
+				fi
+			done
+			for val in PKG_SHORT PKG_DESC; do
+				printf "${CLR_BOLD_RED}%-12s${NORMAL}: " ${val#PKG_}
+				format_desc ${!val}
+			done
+			)
+	done
+}
diff --git a/tools/make-rootfiles b/tools/make-rootfiles
index 4be1596e7..b48d3f898 100644
--- a/tools/make-rootfiles
+++ b/tools/make-rootfiles
@@ -86,15 +86,14 @@ rootfiles_commit() {
 
 rootfiles_copy() {
 	for i in $@; do
-		(	unset NAME VERSION
-			ROOTFILE=$(rootfiles_findone $i)
+		(	ROOTFILE=$(rootfiles_findone $i)
 			if [ "$ROOTFILE" = "" ]; then
 				dialogerror "Rootfile of \"$i\" not found. Create it first."
 				return 1
 			fi
 			eval $(pkg_info $i)
-			for j in $NAME{-$VERSION,} \
-				$(sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g' <<< $NAME){,$VERSION}; do
+			for j in $PKG_NAME{-$PKG_VER,} \
+				$(sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g' <<< $PKG_NAME){,$PKG_VER}; do
 				LOGFILE=$(find $BASEDIR/log_$TARGET/ -type f -name $j ! -name *_old)
 				[ -n "$LOGFILE" ] && break
 			done