Magellan Linux

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

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

revision 1599 by niro, Fri Dec 30 10:07:18 2011 UTC revision 1625 by niro, Fri Jan 13 13:06:13 2012 UTC
# Line 66  mchecksum() Line 66  mchecksum()
66   case ${method} in   case ${method} in
67   md5) cmd="md5sum" ;;   md5) cmd="md5sum" ;;
68   sha256) cmd="sha256sum" ;;   sha256) cmd="sha256sum" ;;
69   *) die "mchecksum(): unkown method '${method}'" ;;   *) die "mchecksum(): unknown method '${method}'" ;;
70   esac   esac
71    
72   if [[ -d ${rundir} ]]   if [[ -d ${rundir} ]]
# Line 3293  known_mage_feature() Line 3293  known_mage_feature()
3293   purge|!purge) retval=0 ;;   purge|!purge) retval=0 ;;
3294   qalint|!qalint) retval=0 ;;   qalint|!qalint) retval=0 ;;
3295   regentree|!regentree) retval=0 ;;   regentree|!regentree) retval=0 ;;
3296     resume|!resume) retval=0 ;;
3297   stepbystep|!stepbystep) retval=0 ;;   stepbystep|!stepbystep) retval=0 ;;
3298   srcpkgbuild|!srcpkgbuild) retval=0 ;;   srcpkgbuild|!srcpkgbuild) retval=0 ;;
3299   srcpkgtarball|!srcpkgtarball) retval=0 ;;   srcpkgtarball|!srcpkgtarball) retval=0 ;;
# Line 3305  known_mage_feature() Line 3306  known_mage_feature()
3306    
3307  load_mage_features()  load_mage_features()
3308  {  {
  echo -en "${COLBLUE}---${COLGREEN} Loading mage-features... ${COLDEFAULT}"  
3309   for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}   for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}
3310   do   do
3311   FVERBOSE=off msetfeature ${i}   FVERBOSE=off msetfeature ${i}
3312   done   done
   
  echo -e "${COLGREEN}done${COLDEFAULT}"  
3313  }  }
3314    
3315  msetfeature()  msetfeature()
# Line 3328  msetfeature() Line 3326  msetfeature()
3326    
3327   if ! known_mage_feature "${feature}"   if ! known_mage_feature "${feature}"
3328   then   then
3329   [[ ${FVERBOSE} = off ]] || echo "unkown feature ${feature}, ignoring it"   [[ ${FVERBOSE} = off ]] || echo "unknown feature ${feature}, ignoring it"
3330   return 3   return 3
3331   fi   fi
3332    

Legend:
Removed from v.1599  
changed lines
  Added in v.1625