--- trunk/mage/usr/lib/mage/mage4.functions.sh	2008/06/16 09:29:57	739
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2009/08/04 19:52:16	892
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Magellan Linux Installer Functions (mage.functions.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.37 2008-06-16 09:29:27 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.38 2008-10-05 10:32:24 niro Exp $
 
 mage_setup()
 {
@@ -298,19 +298,19 @@
 
 		ln -snf "${link}" "${MROOT}${pathto}"
 
-		# fix mtime and db
-		fix_descriptor ${pkgname}/.symlinks \
-			"${pathto}" \
-			"${posix}" \
-			"${link}" \
-			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
-				"${MROOT}${pathto}")"
+# 		# fix mtime and db
+# 		fix_descriptor ${pkgname}/.symlinks \
+# 			"${pathto}" \
+# 			"${posix}" \
+# 			"${link}" \
+# 			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
+# 				"${MROOT}${pathto}")"
 
 	done < ${BUILDDIR}/${pkgname}/.symlinks
 
-	# now copy the fixed file over the old one
-	[ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \
-		cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}
+# 	# now copy the fixed file over the old one
+# 	[ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \
+# 		cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}
 
 	# very important: unsetting the '§' fieldseperator
 	IFS=$'\n'
@@ -2163,6 +2163,7 @@
 	local count_current
 	local magefile
 	local src_install
+	local i
 
 	# very basic getops
 	for i in $*
@@ -2238,9 +2239,27 @@
 
 		if [[ -z ${MAGE_TARGETS} ]]
 		then
-			smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+			# basic svn compat
+			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+			then
+				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
+				do
+					smage2file="${i}"
+				done
+			else
+				smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+			fi
 		else
-			smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+			# basic svn compat
+			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+			then
+				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+				do
+					smage2file="${i}"
+				done
+			else
+				smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+			fi
 		fi
 		if [ -f "${smage2file}" ]
 		then
@@ -2770,7 +2789,13 @@
 	[[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable
 	[[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing
 
-	local EXCLUDED="${MROOT}/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