--- trunk/mage/usr/lib/mage/mage4.sh	2011/12/28 12:23:50	1584
+++ trunk/mage/usr/lib/mage/mage4.sh	2013/10/16 07:41:04	2222
@@ -5,7 +5,8 @@
 # default die function
 die()
 {
-	echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
+	xtitleclean
+	mqueryfeature "debug" && echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
 	echo -e ${COLRED}"$@"${COLDEFAULT}
 	exit 1
 }
@@ -65,10 +66,13 @@
 	echo "    upgrade         - runs a complete system upgrade"
 	echo "    srcuppretend    - pretend dependencies for a system upgrade from source"
 	echo "    srcupgrade      - runs a complete system upgrade from source"
+	echo "    pretend-build-prerequisites"
+	echo "    install-build-prerequisites"
 	echo "    search          - searches mage-tree for a package"
 	echo "    clean           - removes *all* downloaded packages"
 	echo "    unpack          - unpacks *all* needed package for 'foo'"
 	echo "    download        - downloads *all* needed packages for 'foo'"
+	echo "    print-features  - prints all enabled mage-features"
 	echo "    version         - prints version info"
 	echo "    regen-mage-tree - regenerates the whole mage database (for devs only)"
 	echo
@@ -97,16 +101,17 @@
 # initial unversionized packagename, gets overridden later on
 MAGENAME="$2"
 
-if [[ ${METHOD} != upgrade ]] && \
-	[[ ${METHOD} != srcupgrade ]] && \
-	[[ ${METHOD} != uppretend ]] && \
-	[[ ${METHOD} != srcuppretend ]] && \
-	[[ ${METHOD} != update ]] && \
-	[[ ${METHOD} != update-tarball ]] && \
-	[[ ${METHOD} != clean ]] && \
-	[[ ${METHOD} != version ]] && \
-	[[ ${METHOD} != search ]] && \
-	[[ ${METHOD} != regen-mage-tree ]]
+if [[ ${METHOD} != upgrade ]] &&
+	[[ ${METHOD} != srcupgrade ]] &&
+	[[ ${METHOD} != uppretend ]] &&
+	[[ ${METHOD} != srcuppretend ]] &&
+	[[ ${METHOD} != update ]] &&
+	[[ ${METHOD} != update-tarball ]] &&
+	[[ ${METHOD} != clean ]] &&
+	[[ ${METHOD} != version ]] &&
+	[[ ${METHOD} != search ]] &&
+	[[ ${METHOD} != regen-mage-tree ]] &&
+	[[ ${METHOD} != print-features ]]
 then
 	[[ -z ${METHOD} ]] || [[ -z ${MAGENAME} ]] && print_usage && exit 1
 fi
@@ -124,6 +129,14 @@
 # load supported mage features
 load_mage_features
 
+# query debug mode
+if mqueryfeature "debug"
+then
+	depwalker_debug="--debug"
+else
+	depwalker_debug=""
+fi
+
 case ${METHOD} in
 	download)
 		# first of all get the right pkg which going to be installed
@@ -150,7 +163,8 @@
 			--pcat ${PCAT} \
 			--pname ${PNAME} \
 			--pver ${PVER} \
-			--pbuild ${PBUILD})"
+			--pbuild ${PBUILD} \
+			${depwalker_debug})"
 		fetch_packages ${ALLDEPS} || die "fetching packages"
 		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
 		;;
@@ -180,11 +194,12 @@
 			--pcat ${PCAT} \
 			--pname ${PNAME} \
 			--pver ${PVER} \
-			--pbuild ${PBUILD})"
+			--pbuild ${PBUILD} \
+			${depwalker_debug})"
 		fetch_packages ${ALLDEPS} || die "fetching packages"
 		;;
 
-	pretend|srcpretend)
+	pretend|srcpretend|pretend-build-prerequisites)
 		# first of all get the right pkg which going to be installed
 		PCAT="$(pname2pcat ${MAGENAME})"
 
@@ -217,10 +232,11 @@
 			--pcat ${PCAT} \
 			--pname ${PNAME} \
 			--pver ${PVER} \
-			--pbuild ${PBUILD}
+			--pbuild ${PBUILD} \
+			${depwalker_debug}
 		;;
 
-	install)
+	install|install-build-prerequisites)
 		have_root_privileges || die "You must be root to run this operation."
  
 		# first of all get the right pkg which going to be installed
@@ -255,12 +271,12 @@
 			--pcat ${PCAT} \
 			--pname ${PNAME} \
 			--pver ${PVER} \
-			--pbuild ${PBUILD})"
+			--pbuild ${PBUILD} \
+			${depwalker_debug})"
 
 		# first fetch all packages
 		fetch_packages ${ALLDEPS} || die "fetching packages"
 		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
-		unpack_packages ${ALLDEPS} || die "unpacking packages"
 		install_packages ${ALLDEPS} || die "installing packages"
 		;;
 
@@ -299,7 +315,8 @@
 			--pcat ${PCAT} \
 			--pname ${PNAME} \
 			--pver ${PVER} \
-			--pbuild ${PBUILD})"
+			--pbuild ${PBUILD} \
+			${depwalker_debug})"
 
 		install_packages --src-install ${ALLDEPS} || die "src-installing packages"
 		;;
@@ -321,7 +338,8 @@
 			--pcat ${METHOD} \
 			--pname ${METHOD} \
 			--pver ${METHOD} \
-			--pbuild ${METHOD}
+			--pbuild ${METHOD} \
+			${depwalker_debug}
 		;;
 
 	upgrade)
@@ -334,12 +352,12 @@
 			--pcat ${METHOD} \
 			--pname ${METHOD} \
 			--pver ${METHOD} \
-			--pbuild ${METHOD})"
+			--pbuild ${METHOD} \
+			${depwalker_debug})"
 
 		# first fetch all packages
 		fetch_packages ${ALLDEPS} || die "fetching packages"
 		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
-		unpack_packages ${ALLDEPS} || die "unpacking packages"
 		install_packages ${ALLDEPS} || die "installing packages"
 		;;
 
@@ -353,7 +371,8 @@
 			--pcat ${METHOD} \
 			--pname ${METHOD} \
 			--pver ${METHOD} \
-			--pbuild ${METHOD})"
+			--pbuild ${METHOD} \
+			${depwalker_debug})"
 
 		install_packages --src-install ${ALLDEPS} || die "src-installing packages"
 		;;
@@ -389,7 +408,9 @@
 			--pcat ${PCAT} \
 			--pname ${PNAME} \
 			--pver ${PVER} \
-			--pbuild ${PBUILD})"
+			--pbuild ${PBUILD} \
+			${depwalker_debug})"
+
 		fetch_packages ${ALLDEPS} || die "fetching packages"
 		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
 		unpack_packages ${ALLDEPS} || die "unpacking packages"
@@ -429,6 +450,10 @@
 		done
 		;;
 
+	print-features)
+		mprintfeatures
+		;;
+
 	*)
 		print_usage
 		;;