diff options
author | Erich Eckner <git@eckner.net> | 2018-05-15 15:15:17 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-05-15 15:15:17 +0200 |
commit | 1276fc83a644462a5017d59c2ce101dd669dbdee (patch) | |
tree | d69e792c28dc9e473675e275bcde720c0e007b1e /conf | |
parent | 38f7d4a9613cfcb412cadf64a07e703487f1658d (diff) | |
download | builder-1276fc83a644462a5017d59c2ce101dd669dbdee.tar.xz |
conf/default.conf: source lib/mysql-functions only if mysqld is running
Diffstat (limited to 'conf')
-rwxr-xr-x | conf/default.conf | 10 |
1 files changed, 8 insertions, 2 deletions
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" |