--- trunk/mage/usr/lib/mage/mage4.functions.sh	2005/10/21 16:01:40	280
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2005/12/01 12:38:45	286
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Magellan Linux Installer Functions (mage.functions.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.9 2005-10-21 16:01:40 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.10 2005-12-01 12:38:45 niro Exp $
 
 mage_setup()
 {
@@ -1119,7 +1119,7 @@
 				--continue \
 				--progress bar \
 				--directory-prefix=${PKGDIR} \
-				${opt} ${mirr}/packages/${pkg}
+				${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
 			if [[ $? = 0 ]]
 			then
 				break
@@ -1251,7 +1251,7 @@
 	STATE="$(get_value_from_magefile STATE "$1")"
 
 	# state testing
-	if [[ ${USE_TESTING} = true ]]
+	if [[ ${USE_TESTING} = true ]] || [[ ${MAGE_DISTRIBUTION} = testing ]]
 	then
 		case ${STATE} in
 			testing|stable) return 0 ;;
@@ -1260,7 +1260,7 @@
 	fi
 
 	# state unstable
-	if [[ ${USE_UNSTABLE} = true ]]
+	if [[ ${USE_UNSTABLE} = true ]] || [[ ${MAGE_DISTRIBUTION} = unstable ]]
 	then
 		case ${STATE} in
 			unstable|testing|stable) return 0 ;;