From c772be57eca3a2176ac3931c02fb582f85c0d575 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 22 Mar 2018 15:19:23 +0100
Subject: decommission package-states directory - we rely on the database now

---
 bin/get-assignment | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'bin/get-assignment')

diff --git a/bin/get-assignment b/bin/get-assignment
index 3357fc6..a82e1f8 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -18,17 +18,8 @@
 # TODO: honor manual build order of tool-chain:
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
-mkdir -p "${work_dir}/package-states"
-
 hand_out_assignment() {
 
-  # we don't care anymore if an older version of this package was
-  # "locked" or "broken"
-  find "${work_dir}/package-states" -maxdepth 1 -regextype grep \
-    -regex '.*/'"$(str_to_regex "$1")"'\(\.[^.]\+\)\{3\}\.\(locked\|broken\)' \
-    -not -regex '.*/'"$(str_to_regex "$1.$2.$3.$4.")"'[^.]\+' \
-    -delete
-
   # move that build order to the end of the build-list
   sed -i '
     /^'"$(str_to_regex "$1 $2 $3 $4")"'$/ {
@@ -57,21 +48,7 @@ hand_out_assignment() {
     printf ' AND `upstream_repositories`.`name`=from_base64("%s")' \
       "$(printf '%s' "$4" | base64 -w0)"
     printf ' LIMIT 1;\n'
-  } | \
-    mysql_run_query | \
-    tr '\t' ' '
 
-  {
-    # shellcheck disable=SC2154
-    echo "${slave}"
-    if [ -r "${work_dir}/package-states/$1.$2.$3.$4.locked" ]; then
-      cat "${work_dir}/package-states/$1.$2.$3.$4.locked"
-    fi
-  } | \
-    sort -u | \
-    sponge "${work_dir}/package-states/$1.$2.$3.$4.locked"
-  # shellcheck disable=SC2016
-  {
     printf 'UPDATE `build_slaves`'
     printf ' SET `currently_building` = ('
     printf ' SELECT `build_assignments`.`id`'
@@ -86,6 +63,7 @@ hand_out_assignment() {
     printf ' `upstream_repositories`.`name` = from_base64("%s")' \
       "$(printf '%s' "$4" | base64 -w0)"
     printf ')'
+    # shellcheck disable=SC2154
     printf ' WHERE `build_slaves`.`name`=from_base64("%s");\n' \
       "$(printf '%s' "${slave}" | base64 -w0)"
 
@@ -101,7 +79,8 @@ hand_out_assignment() {
     printf ' `upstream_repositories`.`name` = from_base64("%s");\n' \
       "$(printf '%s' "$4" | base64 -w0)"
   } | \
-    mysql_run_query
+    mysql_run_query | \
+    tr '\t' ' '
 
   exit 0
 
-- 
cgit v1.2.3-70-g09d2