From e81196e242a3de0c3b9c4394c7aedbb84bdc87b6 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 30 May 2018 11:10:15 +0200
Subject: repo_names and repo_paths__* is read from the database on the
 buildmaster, now

---
 lib/load-configuration | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'lib/load-configuration')

diff --git a/lib/load-configuration b/lib/load-configuration
index 5a1fd84..01c27b5 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -28,14 +28,12 @@ if pgrep -x mysqld >/dev/null 2>&1; then
   . "${base_dir}/lib/mysql-functions"
 else
   i_am_the_master=false
-fi
 
-# TODO: some of this should be read from the database instead
-# (in mysql_retrieve_static_information)
-repo_names='packages community archlinux32'
-repo_paths__packages="${work_dir}/repos/packages"
-repo_paths__community="${work_dir}/repos/community"
-repo_paths__archlinux32="${work_dir}/repos/packages32"
+  repo_names='packages community archlinux32'
+  repo_paths__packages="${work_dir}/repos/packages"
+  repo_paths__community="${work_dir}/repos/community"
+  repo_paths__archlinux32="${work_dir}/repos/packages32"
+fi
 
 master_build_server="buildmaster.archlinux32.org"
 master_build_server_port="22"
-- 
cgit v1.2.3