From b3023cfe9c2d4e8319885e22a575bd1a522b3f6c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 22 Mar 2018 15:42:11 +0100
Subject: decommission build-list file

---
 bin/bootstrap-mysql       |  6 ------
 bin/get-assignment        |  9 ---------
 bin/get-package-updates   | 33 ++++-----------------------------
 bin/prioritize-build-list |  6 ------
 bin/return-assignment     |  3 ---
 bin/seed-build-list       |  2 --
 6 files changed, 4 insertions(+), 55 deletions(-)

(limited to 'bin')

diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index fc347d7..817989d 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -796,12 +796,6 @@ fi
 } | \
   mysql_run_query
 
-tr ' ' '.' < \
-  "${work_dir}/build-list" | \
-  while read -r state_file; do
-    mysql_generate_package_metadata 'build-list' "${state_file}"
-  done
-
 grep '^\('"$(
   # shellcheck disable=SC2086
   printf '%s\\|' ${standalone_package_repositories} ${stable_package_repositories}
diff --git a/bin/get-assignment b/bin/get-assignment
index a82e1f8..7ac749f 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -20,15 +20,6 @@
 
 hand_out_assignment() {
 
-  # move that build order to the end of the build-list
-  sed -i '
-    /^'"$(str_to_regex "$1 $2 $3 $4")"'$/ {
-      $ b
-      d
-    }
-    $ a '"$1 $2 $3 $4" \
-    "${work_dir}/build-list"
-
   # shellcheck disable=SC2016
   {
     printf 'SELECT '
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 3e9edf9..dcc9f3b 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -110,7 +110,6 @@ delete_package() {
   } | \
     mysql_run_query >> \
     "${work_dir}/deletion-list.new"
-  sed -i "/^$(str_to_regex "${1}") /d" "${work_dir}/build-list.new"
   # TODO: Once we want to rely on the database for test_exclusion, we
   # need to run the command below unconditionally, but with some
   # changes, so we can easily revert.
@@ -201,9 +200,6 @@ echo 'Check modified packages from the last update, and put them to the build li
 # If a package is deleted, remove from the rebuild list, and add it to the deletion list.
 # If a new package is added, then ensure that it's not on the deletion list.
 
-cp \
-  "${work_dir}/build-list" \
-  "${work_dir}/build-list.new"
 cp \
   "${work_dir}/deletion-list" \
   "${work_dir}/deletion-list.new"
@@ -223,26 +219,9 @@ for repo in ${repo_names}; do
       git -C "${repo_path}" diff --no-renames --name-status "${old_repo_revision}" "${new_repo_revision}"
     fi
   } | \
-    # Packages which are already on the build list should receive a git_revision bump if _any_ file changed.
-    # Thus, we rename any file "PKGBUILD" to trigger the successive logic.
-    if [ "${repo}" = 'archlinux32' ]; then
-      sed "$(
-        sed '
-          s/ .*$//
-          s|^|\\@^.\\t[^/]\\+/|
-          s|$|/@ s@/[^/]*$@/PKGBUILD@|
-        ' "${work_dir}/build-list"
-      )"
-    else
-      sed "$(
-        sed '
-          s/ .*$//
-          s|^|\\@^.\\t|
-          s|$|/@ s@/[^/]*$@/PKGBUILD@|
-        ' "${work_dir}/build-list"
-      )"
-    fi | \
     # only track changes in PKGBUILDs
+    # TODO: However, packages which are already on the build list should
+    # receive a git_revision bump if _any_ file changed.
     grep '/PKGBUILD$' | \
     if [ "${repo}" = "archlinux32" ]; then
     # modify the directory structure from the modifiaction-repository
@@ -312,11 +291,6 @@ done | \
       fi
     fi
     if [ "${mode}" = 'A' ] || [ "${mode}" = 'M' ]; then
-      # new or modified PKGBUILD
-      sed -i "/^$(str_to_regex "${package}") /d" "${work_dir}/build-list.new"
-      # shellcheck disable=SC2154
-      echo "${package} ${git_revision} ${new_repo_revisions__archlinux32} ${repository}" >> \
-        "${work_dir}/build-list.new"
       sed -i "/^$(str_to_regex "${package}")\$/d" "${work_dir}/deletion-list.new"
       # shellcheck disable=SC2016
       {
@@ -346,6 +320,7 @@ done | \
           )"
       } | \
         mysql_run_query
+      # shellcheck disable=SC2154
       mysql_generate_package_metadata 'to-be-decided' "${package}" "${git_revision}" "${new_repo_revisions__archlinux32}" "${repository}"
       continue
     fi
@@ -530,7 +505,7 @@ mysql_find_build_assignment_loops
 # Move the .new-files to the actual files
 
 {
-  printf '%s\n' "build-list" "deletion-list"
+  printf '%s\n' "deletion-list"
   # shellcheck disable=SC2086
   printf '%s.revision\n' ${repo_names}
 } | \
diff --git a/bin/prioritize-build-list b/bin/prioritize-build-list
index 1ff3d5a..db828ae 100755
--- a/bin/prioritize-build-list
+++ b/bin/prioritize-build-list
@@ -23,12 +23,6 @@ if ! flock -s -n 8; then
   exit 1
 fi
 
-{
-  sed -n "/^$1/p" "${work_dir}/build-list"
-  sed "/^$1/d" "${work_dir}/build-list"
-} | \
-  sponge "${work_dir}/build-list"
-
 # shellcheck disable=SC2016
 {
   printf 'UPDATE `build_assignments`'
diff --git a/bin/return-assignment b/bin/return-assignment
index da9e762..a2669f6 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -497,9 +497,6 @@ for package in ${packages}; do
   remove_old_package_versions 'i686' "${destination}" "${package}"
 done
 
-# remove package from build list
-sed -i "/^$(str_to_regex "$1 $2 $3 $4")\$/d" "${work_dir}/build-list"
-
 # shellcheck disable=SC2016
 {
   printf 'UPDATE `build_assignments`'
diff --git a/bin/seed-build-list b/bin/seed-build-list
index 41707dd..ae08d57 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -374,8 +374,6 @@ printf 'CREATE TEMPORARY TABLE `pkgbases` (`pkgbase` VARCHAR(64), `repository` V
       printf '%s ' "${pkgbase}" "${git_rev}" "${mod_git_rev}" "${repo}" | \
         sed 's/ $/\n/'
       mysql_generate_package_metadata 'build-list' "${pkgbase}" "${git_rev}" "${mod_git_rev}" "${repo}"
-      printf '%s %s %s %s\n' "${pkgbase}" "${git_rev}" "${mod_git_rev}" "${repo}" >> \
-        "${work_dir}/build-list"
       printf '\n' >&2
     done
 
-- 
cgit v1.2.3