From 1276fc83a644462a5017d59c2ce101dd669dbdee Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 15 May 2018 15:15:17 +0200
Subject: conf/default.conf: source lib/mysql-functions only if mysqld is
 running

---
 conf/default.conf | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/default.conf b/conf/default.conf
index daaf31c..6f3026a 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -18,8 +18,14 @@ work_dir="${base_dir}/work"
 
 # shellcheck source=../lib/common-functions
 . "${base_dir}/lib/common-functions"
-# shellcheck source=../lib/mysql-functions
-. "${base_dir}/lib/mysql-functions"
+
+# if mysqld is not running, we're either on a build slave and don't need
+# lib/mysql-functions or we're on the build master and something is wrong
+# anyway
+if pgrep -x mysqld >/dev/null 2>&1; then
+  # shellcheck source=../lib/mysql-functions
+  . "${base_dir}/lib/mysql-functions"
+fi
 
 repo_names='packages community archlinux32'
 repo_paths__packages="${work_dir}/repos/packages"
-- 
cgit v1.2.3