[arch-projects] [devtools][PATCH] Upload debug packages if available

[Allan McRae]

Debug packages are uploaded to staging/$repo-debug

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 commitpkg.in | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/commitpkg.in b/commitpkg.in
index d779e96..c7c9a2f 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -122,6 +122,7 @@ if [[ -n $(svn status -q) ]]; then
 fi
 
 declare -a uploads
+declare -a debugs
 declare -a commit_arches
 declare -a skip_arches
 
@@ -153,6 +154,25 @@ for _arch in ${arch[@]}; do
 			die "Signature %s.sig is incorrect!" "$pkgfile"
 		fi
 		uploads+=("$sigfile")
+
+		# check for debug package
+		if ! pkgfile==$(find_cached_package "$_pkgname-debug" "$fullver" "${_arch}"); then
+			continue
+		fi
+		debugs+=("$pkgfile")
+
+		sigfile="${pkgfile}.sig"
+		if [[ ! -f $sigfile ]]; then
+			msg "Signing package ${pkgfile}..."
+			if [[ -n $GPGKEY ]]; then
+				SIGNWITHKEY="-u ${GPGKEY}"
+			fi
+			gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "${pkgfile}" || die
+		fi
+		if ! gpg --verify "$sigfile" >/dev/null 2>&1; then
+			die "Signature %s.sig is incorrect!" "$pkgfile"
+		fi
+		debugs+=("$sigfile")
 	done
 done
 
@@ -180,6 +200,20 @@ if [[ ${#uploads[*]} -gt 0 ]]; then
 	rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
 fi
 
+if [[ ${#debugs[*]} -gt 0 ]]; then
+	new_debugs=()
+
+	# convert to absolute paths so rsync can work with colons (epoch)
+	while read -r -d '' debug; do
+		new_debugs+=("$debugs")
+	done < <(realpath -z "${debugs[@]}")
+
+	uploads=("${new_debugs[@]}")
+	unset new_debugs
+	msg 'Uploading all debug package and signature files'
+	rsync "${rsyncopts[@]}" "${debugs[@]}" "$server:staging/$repo-debug/" || die
+fi
+
 if [[ "${arch[*]}" == 'any' ]]; then
 	if [[ -d ../repos/$repo-i686 && -d ../repos/$repo-x86_64 ]]; then
 		pushd ../repos/ >/dev/null
-- 
2.5.0