--- trunk/mage/usr/lib/mage/smage2.sh	2012/01/09 20:13:34	1617
+++ trunk/mage/usr/lib/mage/smage2.sh	2012/01/13 13:17:21	1630
@@ -177,6 +177,8 @@
 			fi
 
 			echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"
+			# always use verbose mode for source downloads
+			FVERBOSE=off msetfeature "verbose"
 			# do not die here, mchecksum catches download errors
 			mdownload --uri "${uri}" --dir "${outputdir}"
 
@@ -1146,14 +1148,15 @@
 resume_stamp()
 {
 	local step="$1"
-	touch ${BUILDDIR}/.smage-${PKGNAME}-${step}
+	[[ ! -d ${BUILDDIR}/.stamps ]] && install -d ${BUILDDIR}/.stamps
+	touch ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step}
 }
 
 run_resume()
 {
 	local step="$1"
 
-	if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.smage-${PKGNAME}-${step} ]]
+	if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step} ]]
 	then
 		echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"
 		return 0
@@ -1486,6 +1489,12 @@
 		rm -rf ${BUILDDIR}/${PKGNAME}
 	fi
 
+	# clean up stamps dir
+	if [ -d ${BUILDDIR}/.stamps ]
+	then
+		rm -rf ${BUILDDIR}/.stamps
+	fi
+
 	# setup build logging
 	[[ ! -d /var/log/smage ]] && install -d /var/log/smage
 	echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
@@ -1758,7 +1767,7 @@
 		# build src-pkg-tarball if requested
 		if mqueryfeature "srcpkg"
 		then
-			resume_stamp srcpkgbuild || source_pkg_build ${SMAGENAME}
+			run_resume srcpkgbuild || source_pkg_build ${SMAGENAME}
 			resume_stamp srcpkgbuild
 		fi
 fi