Magellan Linux

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

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

revision 858 by niro, Fri May 8 07:05:45 2009 UTC revision 892 by niro, Tue Aug 4 19:52:16 2009 UTC
# Line 2163  mage_install() Line 2163  mage_install()
2163   local count_current   local count_current
2164   local magefile   local magefile
2165   local src_install   local src_install
2166     local i
2167    
2168   # very basic getops   # very basic getops
2169   for i in $*   for i in $*
# Line 2238  mage_install() Line 2239  mage_install()
2239    
2240   if [[ -z ${MAGE_TARGETS} ]]   if [[ -z ${MAGE_TARGETS} ]]
2241   then   then
2242   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2   # basic svn compat
2243     if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
2244     then
2245     for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
2246     do
2247     smage2file="${i}"
2248     done
2249     else
2250     smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
2251     fi
2252   else   else
2253   smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2   # basic svn compat
2254     if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
2255     then
2256     for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
2257     do
2258     smage2file="${i}"
2259     done
2260     else
2261     smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
2262     fi
2263   fi   fi
2264   if [ -f "${smage2file}" ]   if [ -f "${smage2file}" ]
2265   then   then
# Line 2770  blacklisted() Line 2789  blacklisted()
2789   [[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable   [[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable
2790   [[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing   [[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing
2791    
2792   local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"   # support both types for the moment
2793     if [[ -f /etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION} ]]
2794     then
2795     local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
2796     else
2797     local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}"
2798     fi
2799    
2800   # return 0 if the list not exist; nothin is masked   # return 0 if the list not exist; nothin is masked
2801   [[ ! -f ${EXCLUDED} ]] && return 0   [[ ! -f ${EXCLUDED} ]] && return 0

Legend:
Removed from v.858  
changed lines
  Added in v.892