From 97ea124b6588b9b91368cacbd879a339722076c8 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 21 Jun 2017 10:06:15 +0200
Subject: bin/return-assignment: receive and save build log for failed builds,
 be more pedantic about tared files for succeeded builds

---
 bin/return-assignment | 13 ++++++++++++-
 conf/default.conf     |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bin/return-assignment b/bin/return-assignment
index 9d89843..5374f5e 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -42,6 +42,13 @@ if [ "$5" = 'ERROR' ]; then
     exit 0
   fi
 
+  # save sent build logs
+  tar -x \
+    -C "${build_log_directory}" \
+    --wildcards \
+    --no-wildcards-match-slash \
+    '*.build-log.gz'
+
   cat \
     "${work_dir}/package-states/$1.$2.$3.$4.locked" >> \
     "${work_dir}/package-states/$1.$2.$3.$4.broken"
@@ -114,7 +121,11 @@ cd "${tmp_dir}"
 trap clean_up_tmp_dir EXIT
 
 # extract package(s)
-tar -x
+tar -x \
+  --wildcards \
+  --no-wildcards-match-slash \
+  '*.pkg.tar.xz' \
+  '*.pkg.tar.xz.sig'
 
 # check if all packages are signed and all signatures belong to a package
 signature_errors="$(
diff --git a/conf/default.conf b/conf/default.conf
index a43d1f0..f27823c 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -38,6 +38,9 @@ master_mirror_directory='rsync://buildmaster@mirror.archlinux32.org/packages32'
 # to access the master mirror via sshfs (needs to be set up in /etc/fstab)
 master_mirror_sshfs='/mnt/archlinux32'
 
+# directory to keep the build log files in
+build_log_directory='/srv/http/build-logs'
+
 # possibly pull in custom modifications
 
 [ -r "${base_dir}/conf/local.conf" ] && . "${base_dir}/conf/local.conf"
-- 
cgit v1.2.3