From 9ef68780beab5634b7b322bcb731ba5c9aec0350 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 1 Mar 2018 19:03:27 +0100
Subject: lib/mysql-functions: mysql_run_query: only log if sane

---
 lib/mysql-functions | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'lib')

diff --git a/lib/mysql-functions b/lib/mysql-functions
index d8ffeb5..a84d74c 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -25,28 +25,32 @@ base64_encode_each() {
 # mysql_run_query
 # wrapper function to query mysql
 mysql_run_query() {
-  {
-    printf '%s %s: ' "$0" "${mysql_command} $*"
-    date
-  } \
-    | tee -a "${work_dir}/mysql.stdin" \
-    | tee -a "${work_dir}/mysql.stdout" \
-    >> "${work_dir}/mysql.stderr"
-  tee -a "${work_dir}/mysql.stdin" \
-    | ${mysql_command} "$@" \
-    2>> "${work_dir}/mysql.stderr" \
-    | tee -a "${work_dir}/mysql.stdout"
-  for s in \
-    "${work_dir}/mysql.stdin" \
-    "${work_dir}/mysql.stdout" \
-    "${work_dir}/mysql.stderr"; do
+  if [ -s "${work_dir}/build-master-sanity" ]; then
+    ${mysql_command} "$@"
+  else
     {
-      tail -n 10000 "$s"
-      printf '%s %s done: ' "$0" "${mysql_command} $*"
+      printf '%s %s: ' "$0" "${mysql_command} $*"
       date
     } \
-      | sponge "$s"
-  done
+      | tee -a "${work_dir}/mysql.stdin" \
+      | tee -a "${work_dir}/mysql.stdout" \
+      >> "${work_dir}/mysql.stderr"
+    tee -a "${work_dir}/mysql.stdin" \
+      | ${mysql_command} "$@" \
+      2>> "${work_dir}/mysql.stderr" \
+      | tee -a "${work_dir}/mysql.stdout"
+    for s in \
+      "${work_dir}/mysql.stdin" \
+      "${work_dir}/mysql.stdout" \
+      "${work_dir}/mysql.stderr"; do
+      {
+        tail -n 10000 "$s"
+        printf '%s %s done: ' "$0" "${mysql_command} $*"
+        date
+      } \
+        | sponge "$s"
+    done
+  fi
 }
 
 # mysql_add_package_source $pkgbase $git_revision $mod_git_revision $upstream_package_repository
-- 
cgit v1.2.3