summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-06-26 12:10:07 +0200
committerErich Eckner <git@eckner.net>2018-06-26 12:10:07 +0200
commit4006d00df48ff945b0f2c428d230f066cc73435e (patch)
treee0dea70ce2bc01ecdcfa1641dcc13f04e67e7514
parent6dffa7c3c6dc71b70dac9a2bd24faf6825fbe63f (diff)
downloadbuilder-4006d00df48ff945b0f2c428d230f066cc73435e.tar.xz
lib/load-configuration: revert last commit partially - it broke something
-rwxr-xr-xlib/load-configuration19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/load-configuration b/lib/load-configuration
index fb9a2a2..c89e757 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -19,23 +19,19 @@ work_dir="${base_dir}/work"
# shellcheck source=../lib/common-functions
. "${base_dir}/lib/common-functions"
-if [ "$(hostname)" = 'buildmaster.archlinux32.org' ]; then
- i_am_the_master=true
-else
- i_am_the_master=false
-fi
-
# 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"
- # load static values from the database
- mysql_retrieve_static_information
fi
-if ! ${i_am_the_master}; then
+if [ "$(hostname)" = 'buildmaster.archlinux32.org' ]; then
+ i_am_the_master=true
+else
+ i_am_the_master=false
+
repo_names='packages community archlinux32'
repo_paths__packages="${work_dir}/repos/packages"
repo_paths__community="${work_dir}/repos/community"
@@ -111,6 +107,11 @@ if ! ${i_am_the_master} && \
. "${base_dir}/conf/slave.conf"
fi
+# load static values from the database
+if pgrep -x mysqld >/dev/null 2>&1; then
+ mysql_retrieve_static_information
+fi
+
# check / set up environment
if [ -z "${build_list_lock_file}" ]; then