Magellan Linux

Diff of /branches/mage-next/src/smage2.functions.sh.in

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

revision 1795 by niro, Wed Apr 11 21:27:09 2012 UTC revision 2040 by niro, Fri Feb 1 09:45:47 2013 UTC
# Line 591  march() Line 591  march()
591  marchsrcfile()  marchsrcfile()
592  {  {
593   local retval   local retval
594   if [[ ! -z $(eval echo \$SRCFILE_${ARCH/i*86/x86}) ]]   local var="$1"
595    
596     [[ -z ${var} ]] && var="SRCFILE"
597    
598     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
599   then   then
600   eval echo \$SRCFILE_${ARCH/i*86/x86} | tr ';' '\n'   eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
601   retval=0   retval=0
602   else   else
603   retval=1   retval=1
# Line 950  split_save_variables() Line 954  split_save_variables()
954   export SAVED_HOMEPAGE="${HOMEPAGE}"   export SAVED_HOMEPAGE="${HOMEPAGE}"
955   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
956   export SAVED_STATE="${STATE}"   export SAVED_STATE="${STATE}"
  export SAVED_PKGTYPE="${PKGTYPE}"  
957   export SAVED_INHERITS="${INHERITS}"   export SAVED_INHERITS="${INHERITS}"
958   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
959   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
# Line 1025  split_restore_variables() Line 1028  split_restore_variables()
1028   export HOMEPAGE="${SAVED_HOMEPAGE}"   export HOMEPAGE="${SAVED_HOMEPAGE}"
1029   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
1030   export STATE="${SAVED_STATE}"   export STATE="${SAVED_STATE}"
  export PKGTYPE="${SAVED_PKGTYPE}"  
1031   export INHERITS="${SAVED_INHERITS}"   export INHERITS="${SAVED_INHERITS}"
1032   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
1033   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"

Legend:
Removed from v.1795  
changed lines
  Added in v.2040