From a13bfbacf27d09f7c8ea6b4b559b0980ee8957b9 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 7 Mar 2018 16:30:10 +0100
Subject: make -N --raw --batch the default arguments to mysql, explicitely
 override them if required

---
 bin/build-master-status-from-mysql | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'bin/build-master-status-from-mysql')

diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql
index 7cf1b95..a72d396 100755
--- a/bin/build-master-status-from-mysql
+++ b/bin/build-master-status-from-mysql
@@ -27,7 +27,7 @@ fi
   mysql_join_binary_packages_repositories
   printf ' WHERE `repositories`.`name`="build-list"'
 } | \
-  mysql_run_query -N --raw --batch | \
+  mysql_run_query | \
   tr '\t' ' ' | \
   sort > \
   "${tmp_dir}/build-list.mysql"
@@ -45,7 +45,7 @@ sort "${work_dir}/build-list" > \
   mysql_join_build_assignments_package_sources
   mysql_join_package_sources_upstream_repositories
 } | \
-  mysql_run_query -N --raw --batch | \
+  mysql_run_query | \
   tr '\t' ' ' | \
   sort > \
   "${tmp_dir}/locked.mysql"
@@ -66,7 +66,7 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 -name '*.locked' -prin
   printf ' WHERE `repositories`.`name`="deletion-list"'
   printf ' OR `binary_packages`.`is_to_be_deleted`;\n'
 } | \
-  mysql_run_query -N --raw --batch | \
+  mysql_run_query | \
   sort > \
   "${tmp_dir}/deletion-list.mysql"
 sort "${work_dir}/deletion-list" > \
@@ -80,7 +80,7 @@ sort "${work_dir}/deletion-list" > \
   mysql_join_build_assignments_build_dependency_loops
   printf ';\n'
 } | \
-  mysql_run_query -N --raw --batch | \
+  mysql_run_query | \
   sort > \
   "${tmp_dir}/loops.mysql"
 find "${work_dir}/build-list.loops" -regextype grep -mindepth 1 -maxdepth 1 \
@@ -107,7 +107,7 @@ find "${work_dir}/build-list.loops" -regextype grep -mindepth 1 -maxdepth 1 \
   printf ' AND NOT `binary_packages`.`has_issues`'
   printf ' AND `repository_stabilities`.`name`="testing"'
 } | \
-  mysql_run_query -N --raw --batch | \
+  mysql_run_query | \
   sed '
     s/^\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)$/\1-\2:\3-\4.\5-\6.pkg.tar.xz/
   ' | \
@@ -141,7 +141,7 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \
   printf ' AND NOT `binary_packages`.`has_issues`'
   printf ' AND `repository_stabilities`.`name`="testing"'
 } | \
-  mysql_run_query -N --raw --batch | \
+  mysql_run_query | \
   sed '
     s/^\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)$/\1-\2:\3-\4.\5-\6.pkg.tar.xz/
   ' | \
@@ -174,7 +174,7 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \
   mysql_join_package_sources_upstream_repositories
   printf ' WHERE `dependency_types`.`relevant_for_building`'
 } | \
-  mysql_run_query -N --raw --batch | \
+  mysql_run_query | \
   tr '\t' ' ' | \
   sort -u > \
   "${tmp_dir}/build-dependencies.mysql"
@@ -191,7 +191,7 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \
     mysql_join_package_sources_build_assignments
     mysql_join_build_assignments_binary_packages
   } | \
-    mysql_run_query -N --raw --batch | \
+    mysql_run_query | \
     tr '\t' ' ' | \
     while read -r pkgbase git_revision mod_git_revision repository; do
       if [ -f "${work_dir}/package-infos/${pkgbase}.${git_revision}.${mod_git_revision}.${repository}.build-depends" ]; then
-- 
cgit v1.2.3-70-g09d2