Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/bin/return-assignment
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-03-22 15:19:23 +0100
committerErich Eckner <git@eckner.net>2018-03-22 15:19:23 +0100
commitc772be57eca3a2176ac3931c02fb582f85c0d575 (patch)
tree276bbc6566e141444d37ee464a0c9c6c0ac956fe /bin/return-assignment
parente808f93c3f9af51fa32764d3195bbba33b73d026 (diff)
decommission package-states directory - we rely on the database now
Diffstat (limited to 'bin/return-assignment')
-rwxr-xr-xbin/return-assignment38
1 files changed, 0 insertions, 38 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index 02bd491..da9e762 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -89,9 +89,6 @@ if [ "$5" = 'ERROR' ]; then
'*.build-log.gz'
)
- # shellcheck disable=SC2154
- echo "${slave}" >> \
- "${work_dir}/package-states/$1.$2.$3.$4.broken"
# shellcheck disable=SC2016
{
if [ -n "${saved_build_logs}" ]; then
@@ -162,23 +159,6 @@ if [ "$5" = 'ERROR' ]; then
} | \
mysql_run_query
- # shellcheck disable=SC2154
- sed -i '
- /^'"$(str_to_regex "${slave}")"'$/d
- ' "${work_dir}/package-states/$1.$2.$3.$4.locked"
- if [ ! -s "${work_dir}/package-states/$1.$2.$3.$4.locked" ]; then
- rm "${work_dir}/package-states/$1.$2.$3.$4.locked"
-
- # 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"
- fi
-
# release lock on build-list - otherwise seed-build-list won't run
flock -u 9
@@ -517,24 +497,9 @@ for package in ${packages}; do
remove_old_package_versions 'i686' "${destination}" "${package}"
done
-# remove old state files (these should be only "done" markers, but
-# actually we don't care what it is) - as long as it's not "testing" or "tested"
-find "${work_dir}/package-states" -maxdepth 1 -regextype grep \
- -not -name '*.testing' \
- -not -name '*.tested' \
- -regex '.*/'"$(str_to_regex "$1")"'\(\.[^.]\+\)\{4\}' \
- -not -regex '.*/'"$(str_to_regex "$1.$2.$3.$4")"'\.[^.]\+' \
- -exec rm '{}' \;
-
# remove package from build list
sed -i "/^$(str_to_regex "$1 $2 $3 $4")\$/d" "${work_dir}/build-list"
-# remove package lock file
-if ! [ "${destination}" = 'build-support' ]; then
- # shellcheck disable=SC2086
- printf '%s\n' ${packages} > \
- "${work_dir}/package-states/$1.$2.$3.$4.done"
-fi
# shellcheck disable=SC2016
{
printf 'UPDATE `build_assignments`'
@@ -578,6 +543,3 @@ fi
printf 'DROP TABLE `loops_to_delete`;\n'
} | \
mysql_run_query
-rm -f \
- "${work_dir}/package-states/$1.$2.$3.$4.locked" \
- "${work_dir}/package-states/$1.$2.$3.$4.broken"