4 files changed, 37 insertions, 15 deletions
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 4a2b418..560689a 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -22,6 +22,14 @@ clean_pkg() {
 	fi
 }
 
+script_lock
+
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
+		repo_lock "${repo}" "${arch}" || exit 1
+	done
+done
+
 "${CLEANUP_DRYRUN}" && warning 'dry run mode is active'
 
 for repo in "${PKGREPOS[@]}"; do
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index c7ee377..bd89240 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -51,5 +51,4 @@ for _repo in "${PKGREPOS[@]}"; do
 
 	msg2 "Removed the following packages:"
 	plain '%s' "${remove[@]}"
-
 done
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 2895725..c12a128 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -78,15 +78,10 @@ for repo in "${PKGREPOS[@]}"; do
 				continue
 			fi
 
-			# Get the sources from svn
+			# Get the sources from xbs
 			mkdir -p -m0770 "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}"
-			#svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
-			#	"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
-
-			# If it's on official repos, nor [libre], nor [libre-testing]
-			cp -r "${SVNREPO}/$repo/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-				cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-				cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
+			cp -a "$(xbs releasepath "${pkgbase}" "${repo}" "${pkgarch}")" \
+				"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
 				failedpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
 				continue
@@ -94,7 +89,7 @@ for repo in "${PKGREPOS[@]}"; do
 
 			# Build the actual source package
 			pushd "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
-			makepkg --nocolor --allsource --ignorearch # >/dev/null 2>&1
+			SRCPKGDEST=. makepkg --nocolor --allsource --ignorearch --skippgpcheck >"${WORKDIR}/${pkgbase}.log" 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${SRCEXT}" ]; then
 				mv_acl "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}/${pkgbase}-${pkgver}${SRCEXT}"
 				# Avoid creating the same source package for every arch
@@ -102,6 +97,7 @@ for repo in "${PKGREPOS[@]}"; do
 				newpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
 			else
 				failedpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
+				cat "${WORKDIR}/${pkgbase}.log" >> "${WORKDIR}/makepkg-fail.log"
 			fi
 			popd >/dev/null
 		fi
@@ -147,4 +143,9 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
+if [ -f "${WORKDIR}/makepkg-fail.log" ]; then
+	msg "Log of failed packages"
+	cat "${WORKDIR}/makepkg-fail.log"
+fi
+
 script_unlock
diff --git a/cron-jobs/sourceballs.skip b/cron-jobs/sourceballs.skip
index 14d6f4b..0e1731c 100644
--- a/cron-jobs/sourceballs.skip
+++ b/cron-jobs/sourceballs.skip
@@ -1,14 +1,28 @@
-nexuiz-data
+0ad-data
+alienarena-data
+blobwars-data
+btanks-data
+dangerdeep-data
+egoboo-data
+fillets-ng-data
+flightgear-data
+frogatto-data
+gcompris-data
+naev-data
+openarena-data
+rocksndiamonds-data
+smc-data
+speed-dreams-data
 torcs-data
 tremulous-data
 ufoai-data
-frogatto-data
 vdrift-data
-naev-data
-btanks-data
+warmux-data
 wesnoth-data
-texlive-bin
+widelands-data
+xonotic-data
 texlive-bibtexextra
+texlive-bin
 texlive-core
 texlive-fontsextra
 texlive-formatsextra