diff options
| -rwxr-xr-x | lib/mysql-functions | 42 |
1 files changed, 23 insertions, 19 deletions
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 |