Magellan Linux

Diff of /trunk/mage/usr/lib/mage/mage4.functions.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 285 by niro, Fri Oct 21 16:01:40 2005 UTC revision 286 by niro, Thu Dec 1 12:38:45 2005 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2  # Magellan Linux Installer Functions (mage.functions.sh)  # Magellan Linux Installer Functions (mage.functions.sh)
3  # $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 $
4    
5  mage_setup()  mage_setup()
6  {  {
# Line 1119  fetch_packages() Line 1119  fetch_packages()
1119   --continue \   --continue \
1120   --progress bar \   --progress bar \
1121   --directory-prefix=${PKGDIR} \   --directory-prefix=${PKGDIR} \
1122   ${opt} ${mirr}/packages/${pkg}   ${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
1123   if [[ $? = 0 ]]   if [[ $? = 0 ]]
1124   then   then
1125   break   break
# Line 1251  check_stable_package() Line 1251  check_stable_package()
1251   STATE="$(get_value_from_magefile STATE "$1")"   STATE="$(get_value_from_magefile STATE "$1")"
1252    
1253   # state testing   # state testing
1254   if [[ ${USE_TESTING} = true ]]   if [[ ${USE_TESTING} = true ]] || [[ ${MAGE_DISTRIBUTION} = testing ]]
1255   then   then
1256   case ${STATE} in   case ${STATE} in
1257   testing|stable) return 0 ;;   testing|stable) return 0 ;;
# Line 1260  check_stable_package() Line 1260  check_stable_package()
1260   fi   fi
1261    
1262   # state unstable   # state unstable
1263   if [[ ${USE_UNSTABLE} = true ]]   if [[ ${USE_UNSTABLE} = true ]] || [[ ${MAGE_DISTRIBUTION} = unstable ]]
1264   then   then
1265   case ${STATE} in   case ${STATE} in
1266   unstable|testing|stable) return 0 ;;   unstable|testing|stable) return 0 ;;

Legend:
Removed from v.285  
changed lines
  Added in v.286