Backport simple changes from the lukeshu/xbs branch.

2 files changed, 26 insertions, 19 deletions

diff --git a/db-functions b/db-functions
index d76aa41..268b2fe 100644
--- a/db-functions
+++ b/db-functions
@@ -26,6 +26,11 @@ mv_acl() {
 
 # set up general environment
 WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
+if [ -n "${SVNUSER}" ]; then
+	setfacl -m u:"${SVNUSER}":rwx "${WORKDIR}"
+	setfacl -m d:u:"${USER}":rwx "${WORKDIR}"
+	setfacl -m d:u:"${SVNUSER}":rwx "${WORKDIR}"
+fi
 LOCKS=()
 REPO_MODIFIED=0
 
@@ -141,7 +146,6 @@ cleanup() {
 
 	if (( REPO_MODIFIED )); then
 		date +%s > "${FTP_BASE}/lastupdate"
-		date -u +%s > "${FTP_BASE}/lastsync"
 	fi
 
 	[ "$1" ] && exit "$1"
@@ -293,6 +297,13 @@ getpkgarch() {
 	echo "$_ver"
 }
 
+check_packager() {
+	local _packager
+
+	_packager=$(_grep_pkginfo "$1" "packager")
+	[[ $_packager && $_packager != 'Unknown Packager' ]]
+}
+
 getpkgfile() {
 	if [[ ${#} -ne 1 ]]; then
 		error 'No canonical package found!'
@@ -384,7 +395,6 @@ check_splitpkgs() {
 	for pkgfile in "${pkgfiles[@]}"; do
 		issplitpkg "${pkgfile}" || continue
 		local _pkgbase="$(getpkgbase "${pkgfile}")"
-		msg2 "Checking %s" "$_pkgbase"
 		local _pkgname="$(getpkgname "${pkgfile}")"
 		local _pkgarch="$(getpkgarch "${pkgfile}")"
 		mkdir -p "${repo}/${_pkgarch}/${_pkgbase}"
@@ -422,17 +432,6 @@ check_pkgrepos() {
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}" ] && return 1
 	[ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1
 
-	local repo
-	local arch
-	for repo in "${PKGREPOS[@]}"; do
-		for arch in "${ARCHES[@]}"; do
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1
-			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}.sig" ] && return 1
-		done
-	done
-
 	return 0
 }
 
@@ -492,7 +491,7 @@ arch_repo_add() {
 	printf -v pkgs_str -- '%q ' "${pkgs[@]}"
 	# package files might be relative to repo dir
 	pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null
-	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" >/dev/null \
+	/usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" \
 		|| error 'repo-add %q %s' "${repo}${DBEXT}" "${pkgs_str% }"
 	/usr/bin/repo-add -f -q "${repo}${FILESEXT}" "${pkgs[@]}" \
 		|| error 'repo-add -f %q %s' "${repo}${FILESEXT}" "${pkgs_str% }"
@@ -514,7 +513,7 @@ arch_repo_remove() {
 		return 1
 	fi
 	printf -v pkgs_str -- '%q ' "${pkgs[@]}"
-	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" >/dev/null \
+	/usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" \
 		|| error 'repo-remove %q %s' "${dbfile}" "${pkgs_str% }"
 	/usr/bin/repo-remove -q "${filesfile}" "${pkgs[@]}" \
 		|| error 'repo-remove %q %s' "${filesfile}" "${pkgs_str% }"
diff --git a/db-update b/db-update
index 4830791..559ef3f 100755
--- a/db-update
+++ b/db-update
@@ -42,14 +42,22 @@ for repo in "${repos[@]}"; do
 			if ! check_pkgfile "${pkg}"; then
 				die "Package %s is not consistent with its meta data" "${repo}/${pkg##*/}"
 			fi
+			if "${REQUIRE_SIGNATURE}" && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then
+				die "Package %s does not have a valid signature" "${repo}/${pkg##*/}"
+			fi
+			if ! check_pkgxbs "${pkg}" "${repo}"; then
+				die "Package %s is not consistent with %s" "${repo}/${pkg##*/}" "$(xbs name)"
+			fi
 			if ! check_pkgrepos "${pkg}"; then
 				die "Package %s already exists in another repository" "${repo}/${pkg##*/}"
 			fi
+			if ! check_packager "${pkg}"; then
+				die "Package ${repo}/${pkg##*/} does not have a valid packager"
+			fi
 		done
-		# This is fucking obnoxious
-		#if ! check_splitpkgs ${repo} "${pkgs[@]}"; then
-		#	die "Missing split packages for %s" "${repo}"
-		#fi
+		if ! check_splitpkgs "${repo}" "${pkgs[@]}"; then
+			die "Missing split packages for %s" "${repo}"
+		fi
 	else
 		die "Could not read %s" "${STAGING}"
 	fi