From 4697dbe5bb3d088a1007a3d39274a1522e832fc4 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Sun, 21 Jan 2018 21:40:07 +0100
Subject: bin/return-assignment: started to track package movement in database

---
 bin/return-assignment | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index ebaa73a..48c6914 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -368,6 +368,21 @@ if ! [ "${destination}" = 'build-support' ]; then
   printf '%s\n' ${packages} > \
     "${work_dir}/package-states/$1.$2.$3.$4.done"
 fi
+# TODO: mark packages in correct repository in database
+${mysql_command} -e "$(
+  # shellcheck disable=SC2016
+  printf 'UPDATE `build_assignments`'
+  # shellcheck disable=SC2016
+  printf ' JOIN `build_slaves` ON `build_slaves`.`currently_building`=`build_assignments`.`id`'
+  # shellcheck disable=SC2016
+  printf ' SET `build_assignments`.`is_broken`=0, `build_slaves`.`currently_building`=NULL'
+  # shellcheck disable=SC2016
+  printf ' WHERE `build_slaves`.`name`=from_base64("%s");\n' \
+    "$(
+      printf '%s' "${slave}" | \
+        base64 -w0
+    )"
+)"
 rm -f \
   "${work_dir}/package-states/$1.$2.$3.$4.locked" \
   "${work_dir}/package-states/$1.$2.$3.$4.broken"
-- 
cgit v1.2.3-70-g09d2


From 44e86866de30f7c9caaf0af1e4c632af61d95812 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 08:52:35 +0100
Subject: bin/return-assignment: mark packages in correct repository in
 database

---
 bin/return-assignment | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index 48c6914..c47b01c 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -368,21 +368,28 @@ if ! [ "${destination}" = 'build-support' ]; then
   printf '%s\n' ${packages} > \
     "${work_dir}/package-states/$1.$2.$3.$4.done"
 fi
-# TODO: mark packages in correct repository in database
-${mysql_command} -e "$(
-  # shellcheck disable=SC2016
+# shellcheck disable=SC2016
+{
   printf 'UPDATE `build_assignments`'
-  # shellcheck disable=SC2016
   printf ' JOIN `build_slaves` ON `build_slaves`.`currently_building`=`build_assignments`.`id`'
-  # shellcheck disable=SC2016
-  printf ' SET `build_assignments`.`is_broken`=0, `build_slaves`.`currently_building`=NULL'
-  # shellcheck disable=SC2016
+  printf ' JOIN `binary_packages` ON `binary_packages`.`build_assignment`=`build_assignments`.`id`'
+  printf ' SET'
+  printf ' `build_assignments`.`is_broken`=0,'
+  printf ' `build_slaves`.`currently_building`=NULL,'
+  printf ' `binary_packages`.`repository`=(SELECT `repositories`.`id` FROM `repositories` WHERE `repositories`.`name`=from_base64("%s")),' \
+    "$(
+      printf '%s' "${destination}" | \
+        base64 -w0
+    )"
+  printf ' `binary_packages`.`has_issues`=0,'
+  printf ' `binary_packages`.`is_tested`=0'
   printf ' WHERE `build_slaves`.`name`=from_base64("%s");\n' \
     "$(
       printf '%s' "${slave}" | \
         base64 -w0
     )"
-)"
+} | \
+  ${mysql_command}
 rm -f \
   "${work_dir}/package-states/$1.$2.$3.$4.locked" \
   "${work_dir}/package-states/$1.$2.$3.$4.broken"
-- 
cgit v1.2.3-70-g09d2


From 3c2d64c5f91da9f24ff69af4a76bb8712d23a0ec Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 09:03:53 +0100
Subject: style: "${mysql_command} -e $(...)" -> {...} | ${mysql_command}

---
 bin/get-assignment      |  15 ++---
 bin/mysql-functions     | 174 ++++++++++++++++++++++++------------------------
 bin/return-assignment   |  10 ++-
 bin/slave-build-connect |   9 ++-
 4 files changed, 98 insertions(+), 110 deletions(-)

(limited to 'bin/return-assignment')

diff --git a/bin/get-assignment b/bin/get-assignment
index a81a54d..d256248 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -50,33 +50,26 @@ hand_out_assignment() {
   } | \
     sort -u | \
     sponge "${work_dir}/package-states/$1.$2.$3.$4.locked"
-  ${mysql_command} -e "$(
-    # shellcheck disable=SC2016
+  # shellcheck disable=SC2016
+  {
     printf 'UPDATE `build_slaves`'
-    # shellcheck disable=SC2016
     printf ' SET `currently_building` = ('
-    # shellcheck disable=SC2016
     printf ' SELECT `build_assignments`.`id`'
-    # shellcheck disable=SC2016
     printf ' FROM `build_assignments`'
-    # shellcheck disable=SC2016
     printf ' JOIN `package_sources` ON `build_assignments`.`package_source`=`package_sources`.`id`'
-    # shellcheck disable=SC2016
     printf ' JOIN `upstream_repositories` ON `package_sources`.`upstream_package_repository`=`upstream_repositories`.`id`'
     printf ' WHERE'
-    # shellcheck disable=SC2016
     printf ' `package_sources`.`%s` = from_base64("%s") AND' \
       'pkgbase'          "$(printf '%s' "$1" | base64 -w0)" \
       'git_revision'     "$(printf '%s' "$2" | base64 -w0)" \
       'mod_git_revision' "$(printf '%s' "$3" | base64 -w0)"
-    # shellcheck disable=SC2016
     printf ' `upstream_repositories`.`name` = from_base64("%s")' \
       "$(printf '%s' "$4" | base64 -w0)"
     printf ')'
-    # shellcheck disable=SC2016
     printf ' WHERE `build_slaves`.`name`=from_base64("%s");' \
       "$(printf '%s' "${slave}" | base64 -w0)"
-  )"
+  } | \
+    ${mysql_command}
 
   # lock every loop this package breaks
   find "${work_dir}/build-list.loops" -maxdepth 1 -regextype grep \
diff --git a/bin/mysql-functions b/bin/mysql-functions
index ff8fe45..7347994 100755
--- a/bin/mysql-functions
+++ b/bin/mysql-functions
@@ -37,20 +37,19 @@ mysql_add_package_source() {
   done
   values="${values% }"
 
-  ${mysql_command} -e "$(
+  {
     printf 'INSERT IGNORE INTO package_sources'
-    {
-      printf ' ('
-      printf '`%s`, ' ${names}
-      printf ') SELECT'
-      printf ' from_base64("%s"), ' ${values% *}
-      printf ' `upstream_repositories`.`id`'
-      printf ' FROM `upstream_repositories`'
-      printf ' WHERE `upstream_repositories`.`name` = from_base64("%s");' \
-        "${values##* }"
-    } | \
-      sed 's|, )|)|g'
-  )"
+    printf ' ('
+    printf '`%s`, ' ${names}
+    printf ') SELECT'
+    printf ' from_base64("%s"), ' ${values% *}
+    printf ' `upstream_repositories`.`id`'
+    printf ' FROM `upstream_repositories`'
+    printf ' WHERE `upstream_repositories`.`name` = from_base64("%s");' \
+      "${values##* }"
+  } | \
+    sed 's|, )|)|g' | \
+    ${mysql_command}
 }
 
 # mysql_add_binary_package $pkgbase $git_revision $mod_git_revision $upstream_package_repository $pkgname $sub_pkgrel $architecture $repository
@@ -68,33 +67,32 @@ mysql_add_binary_package() {
     shift
   done
 
-  ${mysql_command} -e "$(
+  {
     printf 'INSERT IGNORE INTO binary_packages'
-    {
-      printf ' ('
-      printf '`%s`, ' 'sub_pkgrel' 'pkgname' 'package_source' 'repository' 'architecture'
-      printf ') SELECT'
-      printf ' from_base64("%s"), ' "${sub_pkgrel}" "${pkgname}"
-      printf ' `%s`.`id`,' 'package_sources' 'repositories' 'architectures'
-      printf ' FROM'
-      printf ' `%s` JOIN' 'package_sources' 'repositories' 'architectures'
-      printf ' `upstream_repositories` ON `package_sources`.`upstream_package_repository` = `upstream_repositories`.`id`'
-      printf ' WHERE'
-      printf ' `%s`.`name` = from_base64("%s") AND' \
-        'repositories' "${repository}" \
-        'architectures' "${architecture}"
-      printf ' `package_sources`.`%s` = from_base64("%s") AND' \
-        'pkgbase' "${pkgbase}" \
-        'git_revision' "${git_revision}" \
-        'mod_git_revision' "${mod_git_revision}"
-      printf ' `upstream_repositories`.`name` = from_base64("%s")' \
-        "${upstream_package_repository}"
-    } | \
-      sed '
-        s|, )|)|g
-        s|, FROM| FROM|g
-      '
-  )"
+    printf ' ('
+    printf '`%s`, ' 'sub_pkgrel' 'pkgname' 'package_source' 'repository' 'architecture'
+    printf ') SELECT'
+    printf ' from_base64("%s"), ' "${sub_pkgrel}" "${pkgname}"
+    printf ' `%s`.`id`,' 'package_sources' 'repositories' 'architectures'
+    printf ' FROM'
+    printf ' `%s` JOIN' 'package_sources' 'repositories' 'architectures'
+    printf ' `upstream_repositories` ON `package_sources`.`upstream_package_repository` = `upstream_repositories`.`id`'
+    printf ' WHERE'
+    printf ' `%s`.`name` = from_base64("%s") AND' \
+      'repositories' "${repository}" \
+      'architectures' "${architecture}"
+    printf ' `package_sources`.`%s` = from_base64("%s") AND' \
+      'pkgbase' "${pkgbase}" \
+      'git_revision' "${git_revision}" \
+      'mod_git_revision' "${mod_git_revision}"
+    printf ' `upstream_repositories`.`name` = from_base64("%s")' \
+      "${upstream_package_repository}"
+  } | \
+    sed '
+      s|, )|)|g
+      s|, FROM| FROM|g
+    ' | \
+    ${mysql_command}
 }
 
 # mysql_show_binary_package $pkgname $pkgver $pkgrel $sub_pkgrel
@@ -113,45 +111,44 @@ mysql_show_binary_package() {
   done
 
   local joint
-  ${mysql_command} -e "$(
-    {
-      printf 'SELECT'
-      printf ' `%s`.`%s`,' \
-        'repositories' 'name' \
-        'binary_packages' 'pkgname' \
-        'package_sources' 'pkgver' \
-        'package_sources' 'pkgrel' \
-        'binary_packages' 'sub_pkgrel' \
-        'architectures' 'name' \
-        'package_sources' 'pkgbase' \
-        'package_sources' 'git_revision' \
-        'package_sources' 'mod_git_revision' \
-        'upstream_repositories' 'name'
-      printf ' FROM `binary_packages`'
-      for joint in \
-        'architectures:binary_packages:architecture' \
-        'package_sources:binary_packages:package_source' \
-        'repositories:binary_packages:repository' \
-        'upstream_repositories:package_sources:upstream_package_repository'; do
-        printf ' JOIN `%s` ON `%s`.`id` =' \
-          "${joint%%:*}" "${joint%%:*}"
-        joint="${joint#*:}"
-        printf ' `%s`.`%s`' \
-          "${joint%:*}" "${joint#*:}"
-      done
-      printf ' WHERE'
-      printf ' `%s`.`%s` = from_base64("%s") AND' \
-        'binary_packages' 'pkgname' "${pkgname}" \
-        'binary_packages' 'sub_pkgrel' "${sub_pkgrel}" \
-        'package_sources' 'pkgver' "${pkgver}" \
-        'package_sources' 'pkgrel' "${pkgrel}"
-      printf ';'
-    } | \
-      sed '
-        s|, FROM| FROM|g
-        s|AND;|;|g
-      '
-  )" --html
+  {
+    printf 'SELECT'
+    printf ' `%s`.`%s`,' \
+      'repositories' 'name' \
+      'binary_packages' 'pkgname' \
+      'package_sources' 'pkgver' \
+      'package_sources' 'pkgrel' \
+      'binary_packages' 'sub_pkgrel' \
+      'architectures' 'name' \
+      'package_sources' 'pkgbase' \
+      'package_sources' 'git_revision' \
+      'package_sources' 'mod_git_revision' \
+      'upstream_repositories' 'name'
+    printf ' FROM `binary_packages`'
+    for joint in \
+      'architectures:binary_packages:architecture' \
+      'package_sources:binary_packages:package_source' \
+      'repositories:binary_packages:repository' \
+      'upstream_repositories:package_sources:upstream_package_repository'; do
+      printf ' JOIN `%s` ON `%s`.`id` =' \
+        "${joint%%:*}" "${joint%%:*}"
+      joint="${joint#*:}"
+      printf ' `%s`.`%s`' \
+        "${joint%:*}" "${joint#*:}"
+    done
+    printf ' WHERE'
+    printf ' `%s`.`%s` = from_base64("%s") AND' \
+      'binary_packages' 'pkgname' "${pkgname}" \
+      'binary_packages' 'sub_pkgrel' "${sub_pkgrel}" \
+      'package_sources' 'pkgver' "${pkgver}" \
+      'package_sources' 'pkgrel' "${pkgrel}"
+    printf ';'
+  } | \
+    sed '
+      s|, FROM| FROM|g
+      s|AND;|;|g
+    ' | \
+    ${mysql_command} --html
 }
 
 # mysql_add_install_target $install_target
@@ -164,12 +161,12 @@ mysql_add_install_target() {
       base64 -w0
   )
 
-  ${mysql_command} -e "$(
+  {
     printf 'INSERT IGNORE INTO `install_targets` (`name`)'
     printf ' VALUES (from_base64("%s"))' \
       "${install_target}"
-    printf '\n'
-  )"
+  } | \
+    ${mysql_command}
 }
 
 # mysql_generate_package_metadata $package $git_revision $mod_git_revision $repository
@@ -623,13 +620,14 @@ mysql_sanity_check() {
       "${temp_dir}/master-mirror-listing"
 
     # shellcheck disable=SC2016
-    ${mysql_command} -e '
-      SELECT `repositories`.`name`,`pkgname`,`epoch`,`pkgver`,`pkgrel`,`sub_pkgrel`,`architectures`.`name`
-      FROM `binary_packages`
-      JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id`
-      JOIN `repositories` ON `binary_packages`.`repository`=`repositories`.`id`
-      WHERE `repositories`.`is_on_master_mirror`
-    ' --batch | \
+    {
+      printf 'SELECT `repositories`.`name`,`pkgname`,`epoch`,`pkgver`,`pkgrel`,`sub_pkgrel`,`architectures`.`name`'
+      printf ' FROM `binary_packages`'
+      printf ' JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id`'
+      printf ' JOIN `repositories` ON `binary_packages`.`repository`=`repositories`.`id`'
+      printf ' WHERE `repositories`.`is_on_master_mirror`'
+    } | \
+      ${mysql_command} --batch | \
       sed '
         1d
         s,\t,/,
diff --git a/bin/return-assignment b/bin/return-assignment
index c47b01c..11ad2a9 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -76,20 +76,18 @@ if [ "$5" = 'ERROR' ]; then
   # shellcheck disable=SC2154
   echo "${slave}" >> \
     "${work_dir}/package-states/$1.$2.$3.$4.broken"
-  ${mysql_command} -e "$(
-    # shellcheck disable=SC2016
+  # shellcheck disable=SC2016
+  {
     printf 'UPDATE `build_assignments`'
-    # shellcheck disable=SC2016
     printf ' JOIN `build_slaves` ON `build_slaves`.`currently_building`=`build_assignments`.`id`'
-    # shellcheck disable=SC2016
     printf ' SET `build_assignments`.`is_broken`=1, `build_slaves`.`currently_building`=NULL'
-    # shellcheck disable=SC2016
     printf ' WHERE `build_slaves`.`name`=from_base64("%s");\n' \
       "$(
         printf '%s' "${slave}" | \
           base64 -w0
       )"
-  )"
+  } | \
+    ${mysql_command}
 
   # shellcheck disable=SC2154
   sed -i '
diff --git a/bin/slave-build-connect b/bin/slave-build-connect
index 86ab14b..2ca72a3 100755
--- a/bin/slave-build-connect
+++ b/bin/slave-build-connect
@@ -18,18 +18,17 @@ if [ "${SSH_ORIGINAL_COMMAND%% *}" = "get-assignment" ] || \
   printf '%s %s %s\n' "$(date '+%F %T')" "$1" "${SSH_ORIGINAL_COMMAND}" >> \
     "${work_dir}/ssh-log"
 
-  ${mysql_command} -e "$(
-    # shellcheck disable=SC2016
+  # shellcheck disable=SC2016
+  {
     printf 'UPDATE `build_slaves`'
-    # shellcheck disable=SC2016
     printf ' SET `build_slaves`.`last_connection`=NOW()'
-    # shellcheck disable=SC2016
     printf ' WHERE `build_slaves`.`name`=from_base64("%s")\n' \
       "$(
         printf '%s' "$1" | \
           base64 -w0
       )"
-  )"
+  } | \
+    ${mysql_command}
 
   slave="$1" /bin/sh -c "${base_dir}/bin/${SSH_ORIGINAL_COMMAND}"
 
-- 
cgit v1.2.3-70-g09d2


From 195f789f10cf251d5c2736ba52ebc50420694609 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 13:37:26 +0100
Subject: bin/return-assignment: trace log files/failure reasons

---
 bin/return-assignment | 63 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 57 insertions(+), 6 deletions(-)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index 11ad2a9..545d064 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -60,12 +60,14 @@ if [ "$5" = 'ERROR' ]; then
   fi
 
   # save sent build logs
-  tar -x \
-    -C "${build_log_directory}/error" \
-    --wildcards \
-    --no-wildcards-match-slash \
-    --transform="s|^|$1.$2.$3.$4.|" \
-    '*.build-log.gz'
+  saved_build_logs=$(
+    tar -vx \
+      -C "${build_log_directory}/error" \
+      --wildcards \
+      --no-wildcards-match-slash \
+      --transform="s|^|$1.$2.$3.$4.|" \
+      '*.build-log.gz'
+  )
 
   if [ -f "${work_dir}/package-states/$1.$2.$3.$4.broken" ]; then
     was_broken_before=true
@@ -78,6 +80,55 @@ if [ "$5" = 'ERROR' ]; then
     "${work_dir}/package-states/$1.$2.$3.$4.broken"
   # shellcheck disable=SC2016
   {
+    if [ -n "${saved_build_logs}" ]; then
+      printf 'CREATE TEMPORARY TABLE `failures` ('
+      printf '`%s` %s,' \
+        'date' 'DATETIME' \
+        'reason' 'SMALLINT' \
+        'log_file' 'VARCHAR(512)' | \
+        sed 's/,$//'
+      printf ');'
+      printf 'INSERT INTO `failures` (`date`,`reason`,`log_file`) VALUES'
+      fail_reason_identifiers=$(
+        printf 'SELECT `fail_reasons`.`id`,to_base64(`fail_reasons`.`identifier`) FROM `fail_reasons` ORDER BY `fail_reasons`.`severity`' | \
+          ${mysql_command} --batch
+      )
+      for saved_build_log in ${saved_build_logs}; do
+        printf '%s' "${fail_reason_identifiers}" | \
+          while read -r reason_id identifier; do
+            if zgrep -q "^$(printf '%s' "${identifier}" | base64 -d)\$" "${build_log_directory}/error/${saved_build_log}"; then
+              printf ' (from_base64("%s"),%s,from_base64("%s")),' \
+                "$(
+                  printf '%s' "${saved_build_log}" | \
+                    sed 's|\.build-log\.gz$||;s|^.*\.||' | \
+                    base64 -w0
+                )" \
+                "${reason_id}" \
+                "$(
+                  printf '%s' "${saved_build_log}" | \
+                    base64 -w0
+                )"
+              break
+            fi
+          done
+      done | \
+        sed 's/,$//'
+      printf ';\n'
+      printf 'INSERT INTO `failed_builds` (`build_slave`,`build_assignment`,`date`,`reason`,`log_file`)'
+      printf ' SELECT '
+      printf '`build_slaves`.`%s`,' \
+        'id' 'currently_building'
+      printf '`failures`.`%s`,' \
+        'date' 'reason' 'log_file' | \
+        sed 's/,$//'
+      printf ' FROM `build_slaves` JOIN `failures`'
+      printf ' WHERE `build_slaves`.`name`=from_base64("%s");\n' \
+        "$(
+          printf '%s' "${slave}" | \
+            base64 -w0
+        )"
+      printf 'DROP TABLE `failures`;\n'
+    fi
     printf 'UPDATE `build_assignments`'
     printf ' JOIN `build_slaves` ON `build_slaves`.`currently_building`=`build_assignments`.`id`'
     printf ' SET `build_assignments`.`is_broken`=1, `build_slaves`.`currently_building`=NULL'
-- 
cgit v1.2.3-70-g09d2


From 423cf0b000964db5456f3238febac4809ef8f16c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 13:57:14 +0100
Subject: bin/return-assignment: fix extraction of fail-reason identifier

---
 bin/return-assignment | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index 545d064..e14e93e 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -91,7 +91,8 @@ if [ "$5" = 'ERROR' ]; then
       printf 'INSERT INTO `failures` (`date`,`reason`,`log_file`) VALUES'
       fail_reason_identifiers=$(
         printf 'SELECT `fail_reasons`.`id`,to_base64(`fail_reasons`.`identifier`) FROM `fail_reasons` ORDER BY `fail_reasons`.`severity`' | \
-          ${mysql_command} --batch
+          ${mysql_command} --raw --batch | \
+          sed '1d'
       )
       for saved_build_log in ${saved_build_logs}; do
         printf '%s' "${fail_reason_identifiers}" | \
-- 
cgit v1.2.3-70-g09d2


From 69387349879acc40799478b92c8f693c7fceae4d Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 16:16:36 +0100
Subject: bin/return-assignment: split mysql update in two steps to not lose
 the connection between entries

---
 bin/return-assignment | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index e14e93e..c504bf6 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -425,7 +425,6 @@ fi
   printf ' JOIN `binary_packages` ON `binary_packages`.`build_assignment`=`build_assignments`.`id`'
   printf ' SET'
   printf ' `build_assignments`.`is_broken`=0,'
-  printf ' `build_slaves`.`currently_building`=NULL,'
   printf ' `binary_packages`.`repository`=(SELECT `repositories`.`id` FROM `repositories` WHERE `repositories`.`name`=from_base64("%s")),' \
     "$(
       printf '%s' "${destination}" | \
@@ -438,6 +437,13 @@ fi
       printf '%s' "${slave}" | \
         base64 -w0
     )"
+  printf 'UPDATE `build_slaves` SET'
+  printf ' `build_slaves`.`currently_building`=NULL'
+  printf ' WHERE `build_slaves`.`name`=from_base64("%s");\n' \
+    "$(
+      printf '%s' "${slave}" | \
+        base64 -w0
+    )"
 } | \
   ${mysql_command}
 rm -f \
-- 
cgit v1.2.3-70-g09d2


From 7d67a5bf7d76d8a5b2b11b77a3c17eb37b66be96 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 20:33:40 +0100
Subject: use sponge to send irc messages w/o being interrupted

---
 bin/ii-connect        | 12 ++++++------
 bin/return-assignment |  5 ++---
 bin/sanity-check      |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'bin/return-assignment')

diff --git a/bin/ii-connect b/bin/ii-connect
index b703d77..54e1eb0 100755
--- a/bin/ii-connect
+++ b/bin/ii-connect
@@ -15,8 +15,8 @@ fi
 # register if not yet done
 if tail -n1 "${irc_dir}/nickserv/out" 2> /dev/null | \
   grep -qF 'This nickname is registered. Please choose a different nickname'; then
-  printf 'identify %s\n' "${irc_password}" > \
-    "${irc_dir}/nickserv/in"
+  printf 'identify %s\n' "${irc_password}" | \
+    sponge "${irc_dir}/nickserv/in"
 fi
 
 # join #archlinux-ports if not yet done
@@ -26,8 +26,8 @@ if ! grep ' buildmaster\.archlinux32\.org .* buildmaster$' "${irc_dir}/out" | \
   {
     echo '/j #archlinux-ports'
     echo '/WHO buildmaster'
-  } > \
-    "${irc_dir}/in"
+  } | \
+    sponge "${irc_dir}/in"
 fi
 
 # start watch daemon if not running yet
@@ -69,8 +69,8 @@ if [ "$1" = 'watch' ]; then
                 echo "${reason}" | \
                   head -n5
                 printf '... (%s lines total)\n' "$(echo "${reason}" | wc -l)"
-              fi > \
-                "${out_file%/out}/in"
+              fi | \
+                sponge "${out_file%/out}/in"
             done
           sed -i "/${regex}/d" "${out_file}"
         fi
diff --git a/bin/return-assignment b/bin/return-assignment
index c504bf6..a2961f2 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -213,9 +213,8 @@ if [ "$5" = 'ERROR' ]; then
             sed 's/,$/./'
         fi
         printf '\n'
-      } | tee /dev/stderr > \
-        "${irc_dir}/#archlinux-ports/in"
-        # why do we need tee there in order for the redirection to work???
+      } | \
+        sponge "${irc_dir}/#archlinux-ports/in"
     fi
   fi
 
diff --git a/bin/sanity-check b/bin/sanity-check
index 65ac5f3..8736d47 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -19,8 +19,8 @@ usage() {
 
 i_am_insane() {
   if [ ! -s "${work_dir}/build-master-sanity" ]; then
-    printf '\001ACTION goes insane.\001\n' > \
-      "${irc_dir}/#archlinux-ports/in"
+    printf '\001ACTION goes insane.\001\n' | \
+      sponge "${irc_dir}/#archlinux-ports/in"
   fi
   echo 'build master is insane' > \
     "${work_dir}/build-master-sanity"
@@ -398,6 +398,6 @@ done
 
 if [ -f "${work_dir}/build-master-sanity" ]; then
   rm "${work_dir}/build-master-sanity"
-  printf '\001ACTION resumes sanity.\001\n' > \
-    "${irc_dir}/#archlinux-ports/in"
+  printf '\001ACTION resumes sanity.\001\n' | \
+    sponge "${irc_dir}/#archlinux-ports/in"
 fi
-- 
cgit v1.2.3-70-g09d2


From 14c4f3b1c5e69c903998068dcb8bb26f45a144a3 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 22 Jan 2018 21:06:21 +0100
Subject: bin/return-assignment: zgrep the correct file - we prepended
 something!

---
 bin/return-assignment | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index a2961f2..a2b4c88 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -97,7 +97,7 @@ if [ "$5" = 'ERROR' ]; then
       for saved_build_log in ${saved_build_logs}; do
         printf '%s' "${fail_reason_identifiers}" | \
           while read -r reason_id identifier; do
-            if zgrep -q "^$(printf '%s' "${identifier}" | base64 -d)\$" "${build_log_directory}/error/${saved_build_log}"; then
+            if zgrep -q "^$(printf '%s' "${identifier}" | base64 -d)\$" "${build_log_directory}/error/$1.$2.$3.$4.${saved_build_log}"; then
               printf ' (from_base64("%s"),%s,from_base64("%s")),' \
                 "$(
                   printf '%s' "${saved_build_log}" | \
@@ -106,7 +106,7 @@ if [ "$5" = 'ERROR' ]; then
                 )" \
                 "${reason_id}" \
                 "$(
-                  printf '%s' "${saved_build_log}" | \
+                  printf '%s' "$1.$2.$3.$4.${saved_build_log}" | \
                     base64 -w0
                 )"
               break
-- 
cgit v1.2.3-70-g09d2


From ef0f12279a548aa30e987a29732b82622d302422 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 23 Jan 2018 12:05:00 +0100
Subject: bin/return-assignment: fix multy-line output from mysql query

---
 bin/return-assignment | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index a2b4c88..2253986 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -87,17 +87,33 @@ if [ "$5" = 'ERROR' ]; then
         'reason' 'SMALLINT' \
         'log_file' 'VARCHAR(512)' | \
         sed 's/,$//'
-      printf ');'
+      printf ');\n'
       printf 'INSERT INTO `failures` (`date`,`reason`,`log_file`) VALUES'
       fail_reason_identifiers=$(
-        printf 'SELECT `fail_reasons`.`id`,to_base64(`fail_reasons`.`identifier`) FROM `fail_reasons` ORDER BY `fail_reasons`.`severity`' | \
+        {
+          printf 'SELECT `fail_reasons`.`id`,to_base64(`fail_reasons`.`identifier`),"%%END%%"'
+          printf ' FROM `fail_reasons` ORDER BY `fail_reasons`.`severity`'
+        } | \
           ${mysql_command} --raw --batch | \
-          sed '1d'
+          sed '
+            1d
+            :start
+            s/\s%END%$//
+            t
+            N
+            s/\n//g
+            b start
+          '
       )
       for saved_build_log in ${saved_build_logs}; do
         printf '%s' "${fail_reason_identifiers}" | \
           while read -r reason_id identifier; do
-            if zgrep -q "^$(printf '%s' "${identifier}" | base64 -d)\$" "${build_log_directory}/error/$1.$2.$3.$4.${saved_build_log}"; then
+            if zgrep -q "^$(
+                printf '%s' "${identifier}" | \
+                  base64 -d
+              )\$" \
+              "${build_log_directory}/error/$1.$2.$3.$4.${saved_build_log}"; then
+
               printf ' (from_base64("%s"),%s,from_base64("%s")),' \
                 "$(
                   printf '%s' "${saved_build_log}" | \
-- 
cgit v1.2.3-70-g09d2


From 73127e25b97cd6230c0ab9b8a64af0db04c2d9e1 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 23 Jan 2018 12:10:51 +0100
Subject: bin/return-assignment: cleanup linebreakremovalmess

---
 bin/return-assignment | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'bin/return-assignment')

diff --git a/bin/return-assignment b/bin/return-assignment
index 2253986..cd6d30e 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -91,19 +91,11 @@ if [ "$5" = 'ERROR' ]; then
       printf 'INSERT INTO `failures` (`date`,`reason`,`log_file`) VALUES'
       fail_reason_identifiers=$(
         {
-          printf 'SELECT `fail_reasons`.`id`,to_base64(`fail_reasons`.`identifier`),"%%END%%"'
+          printf 'SELECT `fail_reasons`.`id`,replace(to_base64(`fail_reasons`.`identifier`),"\\n","")'
           printf ' FROM `fail_reasons` ORDER BY `fail_reasons`.`severity`'
         } | \
           ${mysql_command} --raw --batch | \
-          sed '
-            1d
-            :start
-            s/\s%END%$//
-            t
-            N
-            s/\n//g
-            b start
-          '
+          sed '1d'
       )
       for saved_build_log in ${saved_build_logs}; do
         printf '%s' "${fail_reason_identifiers}" | \
-- 
cgit v1.2.3-70-g09d2