From 4006d00df48ff945b0f2c428d230f066cc73435e Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 26 Jun 2018 12:10:07 +0200
Subject: lib/load-configuration: revert last commit partially - it broke
 something

---
 lib/load-configuration | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.3