/[magellan-source]/trunk/mage/usr/lib/mage/mage4.functions.sh

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

Parent Directory | Revision Log | View Patch Patch

-revision 876 by niro,
Thu May 21 19:07:14 2009 UTC
+revision 1211 by niro,
Fri Jan 28 21:39:01 2011 UTC
 Line 198 
 install_files()
  		is_config_protected "${pathto}"
  		retval="$?"
- 		# 0 - not protected        #
+ 		# 0 - not protected         #
- 		# 1 - error                #
+ 		# 1 - error                 #
- 		# 2 - protected            #
+ 		# 2 - protected             #
- 		# 3 - protected but masked #
+ 		# 3 - protected but masked  #
+ 		# 4 - protected but ignored #
  		case ${retval} in
  			# file is not protected - (over)write it
-Line 252 
 install_files()
+Line 253 
 install_files()
  				(( MAGE_PROTECT_COUNTER++ ))
  				export MAGE_PROTECT_COUNTER
  				;;
+ 			# file is protected but ignored, delete the update/do nothing
+)
+ 				if [[ ${VERBOSE} = on ]]
+ 				then
+ 					echo -en "${COLRED}"
+ 					echo -n "! ignr "
+ 					echo -en "${COLDEFAULT}"
+ 					echo " === FILE: ${MROOT}${pathto}"
+ 				fi
+ 				# simply do nothing here
+ 				;;
  		esac
  	done < ${BUILDDIR}/${pkgname}/.files
-Line 326 
 install_blockdevices()
+Line 339 
 install_blockdevices()
  	local pkgname="$1"
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	# sanity checks; abort if not given
-Line 339 
 install_blockdevices()
+Line 354 
 install_blockdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
  		[[ ${VERBOSE} = on ]] && echo -e "\t>>> PIPE: ${MROOT}${pathto}"
- 		mkfifo -m "${posix}" "${MROOT}$pathto"
+ 		mkfifo -m "${posix}" "${MROOT}${pathto}"
+ 		# make it optional atm !!
+ 		if [[ ! -z ${user} ]] && [[ ! -z ${group} ]]
+ 		then
+ 			chown "${user}:${group}" "${MROOT}${pathto}"
+ 		fi
  	done < ${BUILDDIR}/${pkgname}/.pipes
  	# very important: unsetting the '§' fieldseperator
-Line 363 
 install_characterdevices()
+Line 383 
 install_characterdevices()
  	local posix
  	local major
  	local minor
+ 	local user
+ 	local group
  	local IFS
  	# sanity checks; abort if not given
-Line 376 
 install_characterdevices()
+Line 398 
 install_characterdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix major minor
+ 	while read pathto posix major minor user group
  	do
  		[ -z "${pathto}" ] && continue
  		[[ ${VERBOSE} = on ]] && echo -e "\t>>> CHAR: ${MROOT}${pathto}"
  		mknod -m ${posix} "${MROOT}${pathto}" c ${major} ${minor}
+ 		# make it optional atm !!
+ 		if [[ ! -z ${user} ]] && [[ ! -z ${group} ]]
+ 		then
+ 			chown "${user}:${group}" "${MROOT}${pathto}"
+ 		fi
  	done < ${BUILDDIR}/${pkgname}/.char
  	# very important: unsetting the '§' fieldseperator
  	IFS=$'\n'
  }
+ ###################################################
+ # function install_fifos                          #
+ #	install_fifos $PKGNAME                    #
+ ###################################################
+ install_fifos()
+ {
+ 	local pkgname="$1"
+ 	local pathto
+ 	local posix
+ 	local user
+ 	local group
+ 	local IFS
+ 	# sanity checks; abort if not given
+ 	[ -z "${pkgname}" ] && die "install_fifos() \$pkgname not given."
+ 	# check needed global vars
+ 	[ -z "${BUILDDIR}" ] && die "install_fifos() \$BUILDDIR not set."
+ 	# make it optional atm !!
+ 	#[ ! -f ${BUILDDIR}/${pkgname}/.fifo ] && die "install_fifos() .fifo not found"
+ 	[ ! -f ${BUILDDIR}/${pkgname}/.fifo ] && return
+ 	# sets fieldseperator to "§" instead of " "
+ 	IFS=§
+ 	while read pathto posix user group
+ 	do
+ 		[ -z "${pathto}" ] && continue
+ 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> FIFO: ${MROOT}${pathto}"
+ 		mkfifo -m "${posix}" "${MROOT}${pathto}"
+ 		chown "${user}:${group}" "${MROOT}${pathto}"
+ 	done < ${BUILDDIR}/${pkgname}/.fifo
+ 	# very important: unsetting the '§' fieldseperator
+ 	IFS=$'\n'
+ }
  ###################################################
  # function build_doinstall                        #
  #	build_doinstall $PKGNAME                  #
- # NOTE: this is an wrapper do install packages    #
+ # NOTE: this is an wrapper to install packages    #
  ###################################################
  build_doinstall()
  {
-Line 415 
 build_doinstall()
+Line 482 
 build_doinstall()
  	install_symlinks ${pkgname} || die "install symlinks ${pkgname}"
  	install_blockdevices ${pkgname} || die "install blockdevices ${pkgname}"
  	install_characterdevices ${pkgname} || die "install chardevices ${pkgname}"
+ 	install_fifos ${pkgname} || die "install fifos ${pkgname}"
  }
-Line 476 
 install_database_entry()
+Line 544 
 install_database_entry()
  	# create fake file descriptors
  	# used by virtual and source packages
- 	for i in .dirs .symlinks .files .pipes .char
+ 	for i in .dirs .symlinks .files .pipes .char .fifo
  	do
  		touch ${dbrecorddir}/${i}
  	done
-Line 494 
 install_database_entry()
+Line 562 
 install_database_entry()
  			# normal packages needs these files
  			local i
- 			for i in .char .dirs .files .pipes .symlinks
+ 			for i in .char .dirs .files .pipes .symlinks .fifo
  			do
  				install -m 0644 ${BUILDDIR}/${pkgname}/${i} \
  					${dbrecorddir}/${i}
-Line 772 
 remove_files()
+Line 840 
 remove_files()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_files() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_files() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_files() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_files() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 809 
 remove_files()
+Line 877 
 remove_files()
  				is_config_protected "${pathto}"
  				retval="$?"
- 				# 0 - not protected        #
+ 				# 0 - not protected         #
- 				# 1 - error                #
+ 				# 1 - error                 #
- 				# 2 - protected            #
+ 				# 2 - protected             #
- 				# 3 - protected but masked #
+ 				# 3 - protected but masked  #
+ 				# 4 - protected but ignored #
  				case ${retval} in
  					# file is not protected - delete it
-Line 831 
 remove_files()
+Line 900 
 remove_files()
  							echo " === FILE: ${MROOT}${pathto}"
  						fi
  						;;
+ 					# file is protected but ignored, delete the update/do nothing
+)
+ 						if [[ ${VERBOSE} = on ]]
+ 						then
+ 							echo -en "${COLRED}"
+ 							echo -n "! ignr "
+ 							echo -en "${COLDEFAULT}"
+ 							echo " === FILE: ${MROOT}${pathto}"
+ 						fi
+ 						# simply do nothing here
+ 						;;
  				esac
  				;;
 )
-Line 853 
 remove_blockdevices()
+Line 934 
 remove_blockdevices()
  {
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	local pcat
  	local pname
-Line 876 
 remove_blockdevices()
+Line 959 
 remove_blockdevices()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_blockdevices() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_blockdevices() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_blockdevices() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_blockdevices() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 890 
 remove_blockdevices()
+Line 973 
 remove_blockdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
-Line 911 
 remove_characterdevices()
+Line 994 
 remove_characterdevices()
  {
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	local pcat
  	local pname
-Line 934 
 remove_characterdevices()
+Line 1019 
 remove_characterdevices()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_characterdevices() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_characterdevices() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_characterdevices() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_characterdevices() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 948 
 remove_characterdevices()
+Line 1033 
 remove_characterdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
-Line 962 
 remove_characterdevices()
+Line 1047 
 remove_characterdevices()
  ###################################################
+ # function remove_fifos                           #
+ #	remove_fifos $PKGNAME                     #
+ ###################################################
+ remove_fifos()
+ {
+ 	local pathto
+ 	local posix
+ 	local user
+ 	local group
+ 	local IFS
+ 	local pcat
+ 	local pname
+ 	local pver
+ 	local pbuild
+ 	local i
+ 	local pfull
+ 	IFS=$'\n'
+ 	# very basic getops
+ 	for i in $*
+ 	do
+ 		case $1 in
+ 			--pcat|-c) shift; pcat="$1" ;;
+ 			--pname|-n) shift; pname="$1" ;;
+ 			--pver|-v) shift; pver="$1" ;;
+ 			--pbuild|-b) shift; pbuild="$1" ;;
+ 		esac
+ 		shift
+ 	done
+ 	# sanity checks; abort if not given
+ 	[ -z "${pcat}" ] && die "remove_fifos() \$pcat not given."
+ 	[ -z "${pname}" ] && die "remove_fifos() \$pname not given."
+ 	[ -z "${pver}" ] && die "remove_fifos() \$pver not given."
+ 	[ -z "${pbuild}" ] && die "remove_fifos() \$pbuild not given."
+ 	pfull="${pcat}/${pname}-${pver}-${pbuild}"
+ 	# check needed global vars
+ 	[ -z "${BUILDDIR}" ] && die "remove_fifos() \$BUILDDIR not set."
+ 	# make it optional atm !!
+ 	#[ ! -f ${MROOT}${INSTALLDB}/${pfull}/.fifo ] && die "remove_fifos() .fifo not found"
+ 	[ ! -f ${MROOT}${INSTALLDB}/${pfull}/.fifo ] && return
+ 	# sets fieldseperator to "§" instead of " "
+ 	IFS=§
+ 	while read pathto posix user group
+ 	do
+ 		[ -z "${pathto}" ] && continue
+ 		[[ ${VERBOSE} = on ]] && echo -e "\t<<< FIFO: ${MROOT}${pathto}"
+ 		rm "${MROOT}${pathto}"
+ 	done < ${MROOT}${INSTALLDB}/${pfull}/.fifo
+ 	# very important: unsetting the '§' fieldseperator
+ 	IFS=$'\n'
+ }
+ ###################################################
  # function remove_direcories                      #
  #	remove_direcories $PKGNAME                #
  ###################################################
-Line 992 
 remove_directories()
+Line 1139 
 remove_directories()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_directories() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_directories() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_directories() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_directories() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 1049 
 remove_directories()
+Line 1196 
 remove_directories()
  ###################################################
  # function build_douninstall                      #
  #	build_douninstall $PKGNAME                #
- # NOTE: this is an wrapper do remove packages     #
+ # NOTE: this is an wrapper to remove packages     #
  ###################################################
  build_douninstall()
  {
-Line 1083 
 build_douninstall()
+Line 1230 
 build_douninstall()
  	# !! we use § as field seperator !!
  	# doing so prevent us to get errors by filenames with spaces
- 	for i in symlinks files blockdevices characterdevices directories
+ 	for i in symlinks files blockdevices characterdevices directories fifos
  	do
  		remove_${i} \
  			--pcat "${pcat}" \
-Line 1153 
 fetch_packages()
+Line 1300 
 fetch_packages()
  			echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "
  			[[ ${VERBOSE} = off ]] && opt="--quiet"
  			wget \
- 				--passive-ftp \
+ 				${WGET_FETCH_OPTIONS} \
- 				--tries 3 \
- 				--continue \
- 				--progress bar \
  				--directory-prefix=${PKGDIR} \
  				${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
  			if [[ $? = 0 ]]
-Line 1199 
 syncmage()
+Line 1343 
 syncmage()
  	# clean up backup files (foo~)
  	find ${MAGEDIR} -name *~ -exec rm '{}' ';'
- 	# check if an newer mage version is available
+ 	# check if a newer mage version is available
  	is_newer_mage_version_available
  }
  syncmage_tarball()
  {
  	local latest_tarball
+ 	local latest_md5
  	local temp="$(mktemp -d)"
  	local mirr mymirr
+ 	local opt
+ 	# try to get the md5 marked as latest on the server
+ 	latest_md5="mage-latest.md5"
  	# try to get the tarball marked as latest on the server
  	latest_tarball="mage-latest.tar.bz2"
-Line 1218 
 syncmage_tarball()
+Line 1367 
 syncmage_tarball()
  		mymirr="${mirr%/*}"
  		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
- 		echo "fetching latest tarball from ${mymirr} ..."
+ 		echo "fetching latest md5 from ${mymirr} ..."
+ 		[[ ${VERBOSE} = off ]] && opt="--quiet"
+ 		wget \
+ 			${WGET_FETCH_OPTIONS} \
+ 			--directory-prefix=${temp} \
+ 			${opt} ${mymirr}/rsync/tarballs/${latest_md5}
+ 		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 		echo "fetching latest tarball from ${mymirr} ..."
  		wget \
- 			--passive-ftp \
+ 			${WGET_FETCH_OPTIONS} \
- 			--tries 3 \
- 			--continue \
- 			--progress bar \
  			--directory-prefix=${temp} \
- 			${mymirr}/rsync/tarballs/${latest_tarball}
+ 			${opt} ${mymirr}/rsync/tarballs/${latest_tarball}
  		if [[ $? = 0 ]]
  		then
  			break
-Line 1237 
 syncmage_tarball()
+Line 1390 
 syncmage_tarball()
  	if [[ -f ${temp}/${latest_tarball} ]]
  	then
+ 		# check md5
+ 		if [[ ! -f ${temp}/${latest_md5} ]]
+ 		then
+ 			die "md5 is missing ... aborting"
+ 		else
+ 			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 			echo -n "checking md5sum... "
+ 			( cd ${temp}; md5sum --check ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
+ 		fi
  		if [[ -d ${MAGEDIR} ]]
  		then
  			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
-Line 1252 
 syncmage_tarball()
+Line 1415 
 syncmage_tarball()
  		if [[ -d ${temp} ]]
  		then
  			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
- 			echo "clenaing temp-files ..."
+ 			echo "cleaning temp-files ..."
  			rm -rf ${temp}
  		fi
+ 		# check if a newer mage version is available
+ 		is_newer_mage_version_available
  	else
  		die "Could not fetch the latest tarball ... aborting"
  	fi
-Line 1422 
 get_highest_magefile()
+Line 1588 
 get_highest_magefile()
  #        1 - error                                #
  #        2 - protected                            #
  #        3 - protected but masked                 #
+ #        4 - protected but ignored                #
  #                                                 #
  ###################################################
  is_config_protected()
-Line 1430 
 is_config_protected()
+Line 1597 
 is_config_protected()
  	local TEST
  	local PROTECTED
  	local IFS
+ 	local i
+ 	local x
  	EXPFILE="${MROOT}$1"
-Line 1439 
 is_config_protected()
+Line 1608 
 is_config_protected()
  	# to be safe; it may be '§'
  	IFS=' '
- 	# check ob in config protect
+ 	# check if config protected
  	for i in ${CONFIG_PROTECT}
  	do
- 		# ersetzen von $i nur wenn am anfang der variable
+ 		# only replace $i in the beginning of the variable
  		TEST="${EXPFILE/#${MROOT}${i}/Protected}"
  		if [[ ${TEST} != ${EXPFILE} ]]
  		then
- 			# setzen das es protected ist
+ 			# file is config proteced
  			PROTECTED=TRUE
- 			# check ob nicht doch maskiert
+ 			# check if not masked
  			for x in ${CONFIG_PROTECT_MASK}
  			do
  				TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"
-Line 1458 
 is_config_protected()
+Line 1627 
 is_config_protected()
  					PROTECTED=MASKED
  				fi
  			done
+ 			# check if not ignored
+ 			for x in ${CONFIG_PROTECT_IGNORE}
+ 			do
+ 				TEST="${EXPFILE/#${MROOT}${x}/Protect_Ignored}"
+ 				if [[ ${TEST} != ${EXPFILE} ]]
+ 				then
+ 					PROTECTED=IGNORED
+ 				fi
+ 			done
  		fi
  	done
-Line 1472 
 is_config_protected()
+Line 1651 
 is_config_protected()
  			#echo "I'm protected, but masked - delete me"
  			return 3
  			;;
+ 		IGNORED)
+ 			#echo "I'm protected, but ignored - keep me, del update"
+ 			return 4
+ 			;;
  		*)
  			#echo "delete me"
  			return 0
-Line 1683 
 virtuals_add()
+Line 1866 
 virtuals_add()
  #deletes pakages from virtual database
  #$1 virtualname; $2 pkgname
- virtuals_del() {
+ virtuals_del()
+ {
  	local virtualname="$1"
  	local pkgname="$2"
-Line 2117 
 get_value_from_magefile()
+Line 2301 
 get_value_from_magefile()
  	local SDEPEND
  	local PROVIDE
  	local PKGTYPE
+ 	local MAGE_TARGETS
+ 	local SPLIT_PACKAGE_BASE
  	local preinstall
  	local postinstall
  	local preremove
-Line 2237 
 mage_install()
+Line 2423 
 mage_install()
  			echo B:${pbuild}
  		fi
- 		if [[ -z ${MAGE_TARGETS} ]]
+ 		if [[ -n ${MAGE_TARGETS} ]]
  		then
  			# basic svn compat
  			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
  			then
- 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
+ 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
  				do
  					smage2file="${i}"
  				done
  			else
- 				smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+ 				smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
  			fi
+ 		elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
+ 		then
+ 			# basic svn compat
+ 			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+ 			then
+ 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
+ 				do
+ 					smage2file="${i}"
+ 				done
+ 			else
+ 				smage2file=${SMAGESCRIPTSDIR}/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
+ 			fi
  		else
  			# basic svn compat
  			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
  			then
- 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+ 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
  				do
  					smage2file="${i}"
  				done
  			else
- 				smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+ 				smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
  			fi
  		fi
  		if [ -f "${smage2file}" ]
  		then
  			echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
-Line 2604 
 mage_uninstall()
+Line 2805 
 mage_uninstall()
  	unset -f postremove
  }
- show_etc_update_mesg() {
+ show_etc_update_mesg()
+ {
  	[ ${MAGE_PROTECT_COUNTER} -eq 0 ] && return 0
  	echo
-Line 2789 
 blacklisted()
+Line 2991 
 blacklisted()
  	[[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable
  	[[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing
- 	local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
+ 	# support both types for the moment
+ 	if [[ -f /etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION} ]]
+ 	then
+ 		local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
+ 	else
+ 		local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}"
+ 	fi
  	# return 0 if the list not exist; nothin is masked
  	[[ ! -f ${EXCLUDED} ]] && return 0

 Legend:



Removed from v.876
 


changed lines


 
Added in v.1211
 Legend:



Removed from v.876
 


changed lines


 
Added in v.1211
-Removed from v.876
+Added in v.1211