--- trunk/mage/usr/lib/mage/mage4.sh	2005/09/11 19:46:05	239
+++ trunk/mage/usr/lib/mage/mage4.sh	2005/09/27 14:36:57	247
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Magellan Linux Installer (mage.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.6 2005-09-11 19:46:05 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.7 2005-09-27 14:36:57 niro Exp $
 
 # default die function
 die()
@@ -245,7 +245,7 @@
 		if is_installed ${PCAT}/${PNAME}-${PVER}-${PBUILD}
 		then
 			echo -en "Package "
-			echo -en "${COLRED}${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
+			echo -en "${COLRED}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
 			echo -e  " already installed."
 			exit 3
 		fi
@@ -284,7 +284,7 @@
 		if is_installed ${PCAT}/${PNAME}-${PVER}-${PBUILD}
 		then
 			echo -en "Package "
-			echo -en "${COLRED}${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
+			echo -en "${COLRED}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
 			echo -e  " already installed."
 			exit 3
 		fi
@@ -318,7 +318,7 @@
 			--pbuild ${METHOD}
 		;;
 
-	upgrade|srcupgrade)
+	upgrade)
 		# get all dependencies of *all* installed packages
 		# fake pcat,pname,pver,pbuild ...
 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
@@ -328,7 +328,24 @@
 			--pver ${METHOD} \
 			--pbuild ${METHOD})"
 
-		echo "DEBUG: ${ALLDEPS}"
+		# 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"
+		;;
+
+	srcupgrade)
+		# get all dependencies of *all* installed packages
+		# fake pcat,pname,pver,pbuild ...
+		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
+			--method ${METHOD} \
+			--pcat ${METHOD} \
+			--pname ${METHOD} \
+			--pver ${METHOD} \
+			--pbuild ${METHOD})"
+
+		install_packages --src-install ${ALLDEPS} || die "src-installing packages"
 		;;
 
 	search)