From 441f81329e9b20775402aa7778f8ab1141cc4a62 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 19:33:37 -0400
Subject: remove extra whitespace

---
 cron-jobs/repo-sanity-check | 1 -
 testing2x                   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

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/testing2x b/testing2x
index 0c5c8d7..2ed5c25 100755
--- a/testing2x
+++ b/testing2x
@@ -8,7 +8,7 @@ if [ $# -lt 1 ]; then
 	exit 1
 fi
 
-# Lock everything to reduce  possibility of interfering task between the different repo-updates
+# Lock everything to reduce possibility of interfering task between the different repo-updates
 script_lock
 for repo in  'core' 'extra' 'testing'; do
 	for pkgarch in "${ARCHES[@]}"; do
-- 
cgit v1.2.3-54-g00ecf


From 906544cad702b9b8816717c8ba00d40bfe10a471 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 19:34:09 -0400
Subject: sourceballs: Only show makepkg output on errors.

Also, set SRCPKGDEST.
---
 cron-jobs/sourceballs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 2895725..a9addc3 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -94,7 +94,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 +102,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 +148,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
-- 
cgit v1.2.3-54-g00ecf


From 3c2585392d46a3726d25696882d09ec0bf11d1f5 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 19:39:08 -0400
Subject: db-functions: update ${FTP_DIR}/lastupdate when we modify the repo.

Of course, this only works for things that use db-functions, so
db-sync won't touch it.
---
 db-functions | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/db-functions b/db-functions
index a4b072b..2eeffbb 100644
--- a/db-functions
+++ b/db-functions
@@ -27,6 +27,7 @@ mv_acl() {
 # set up general environment
 WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
 LOCKS=()
+REPO_MODIFIED=0
 
 # check if messages are to be printed using color
 unset ALL_OFF BOLD BLUE GREEN RED YELLOW
@@ -137,6 +138,11 @@ cleanup() {
 		script_unlock
 	fi
 	rm -rf "$WORKDIR"
+
+	if (( REPO_MODIFIED )); then
+		date +%s > "${FTP_BASE}/lastupdate"
+	fi
+
 	[ "$1" ] && exit "$1"
 }
 
@@ -510,6 +516,8 @@ arch_repo_add() {
 		|| error '%s' "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}"
 	popd >/dev/null
 	set_repo_permission "${repo}" "${arch}"
+
+	REPO_MODIFIED=1
 }
 
 arch_repo_remove() {
@@ -528,4 +536,6 @@ arch_repo_remove() {
 	/usr/bin/repo-remove -q "${filesfile}" "${pkgs[@]}" \
 		|| error '%s' "repo-remove ${filesfile} ${pkgs[*]}"
 	set_repo_permission "${repo}" "${arch}"
+
+	REPO_MODIFIED=1
 }
-- 
cgit v1.2.3-54-g00ecf


From f4daa699ddc1adda97fc76e5f42000c9e631a7a0 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 18 Jun 2014 19:41:38 -0400
Subject: db-move: Remove code to handle the pre-pkgpool days.

---
 db-move | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/db-move b/db-move
index b057d28..2ac3f4a 100755
--- a/db-move
+++ b/db-move
@@ -79,11 +79,6 @@ for pkgbase in "${args[@]:2}"; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT})
 					pkgfile="${pkgpath##*/}"
 
-					# copy package to pool if needed
-					# TODO: can be removed once every package has been moved to the package pool
-					if [ ! -f "${FTP_BASE}/${PKGPOOL}/${pkgfile}" ]; then
-						cp "${pkgpath}" "${FTP_BASE}/${PKGPOOL}"
-					fi
 					ln -s "../../../${PKGPOOL}/${pkgfile}" "${ftppath_to}/${tarch}/"
 					if [ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile}.sig" ]; then
 						ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
-- 
cgit v1.2.3-54-g00ecf