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

Parent Directory | Revision Log | Patch

	revision 2830 by niro, Wed Aug 13 07:06:44 2014 UTC	revision 2831 by niro, Fri Sep 19 11:18:38 2014 UTC
#	Line 640  marchdepend()	Line 640  marchdepend()
640
641	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
642	then	then
643	echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"	# evaluate with escape strings for the magefile if called by smage
644		# but do not escape if the smagefile was called by depwalker directly
645		if [[ ${SMAGE_DEPEND} = 1 ]]
646		then
647		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
648		else
649		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
650		fi
651	retval=0	retval=0
652	else	else
653	retval=1	retval=1
#	Line 658  marchsdepend()	Line 665  marchsdepend()
665
666	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
667	then	then
668	echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"	# evaluate with escape strings for the magefile if called by smage
669		# but do not escape if the smagefile was called by depwalker directly
670		if [[ ${SMAGE_DEPEND} = 1 ]]
671		then
672		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
673		else
674		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
675		fi
676	retval=0	retval=0
677	else	else
678	retval=1	retval=1

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2830   changed lines   Added in v.2831