From 71e15c002d5596d84b52c05625478a2ed3123695 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 2 May 2018 11:32:17 +0200
Subject: lib/mysql-functions: remove residues of unimportant mysql queries in
 case of error

---
 lib/mysql-functions | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'lib/mysql-functions')

diff --git a/lib/mysql-functions b/lib/mysql-functions
index dad6bc6..5ce7e0c 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -62,21 +62,27 @@ mysql_run_query() {
   # a present query_file means there was an error
   if [ -f "${query_stdin}" ]; then
     >&2 printf 'I could not complete a mysql query!\n'
-    if [ ! -s "${work_dir}/build-master-sanity" ]; then
+    if [ ! -s "${work_dir}/build-master-sanity" ] && \
+      [ -z "${file_name_extra}" ]; then
       printf '\001ACTION failed to execute a mysql query - can you have a look at "%s"?.\001\n' \
         "${query_stdin##*/}" \
         | irc_say
-      for file in \
-        "${query_stdin}" \
-        "${query_stdout}" \
-        "${query_stderr}"; do
-        cp "${file}" "${webserver_directory}/mysql-queries/${file##*/}.txt"
-        chmod go+r "${webserver_directory}/mysql-queries/${file##*/}.txt"
-      done
     fi
+    for file in \
+      "${query_stdin}" \
+      "${query_stdout}" \
+      "${query_stderr}"; do
+      cp "${file}" "${webserver_directory}/mysql-queries/${file##*/}.txt"
+      chmod go+r "${webserver_directory}/mysql-queries/${file##*/}.txt"
+    done
     if [ -z "${file_name_extra}" ]; then
       echo 'A mysql query failed.' > \
         "${work_dir}/build-master-sanity"
+    else
+      rm -f \
+        "${query_stdin}" \
+        "${query_stdout}" \
+        "${query_stderr}"
     fi
     return 2
   fi
-- 
cgit v1.2.3-70-g09d2