Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/build-master-status-from-mysql20
-rwxr-xr-xbin/cleanup7
-rwxr-xr-xbin/get-package-updates35
-rwxr-xr-xconf/default.conf1
4 files changed, 4 insertions, 59 deletions
diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql
index c6df53b..962b12e 100755
--- a/bin/build-master-status-from-mysql
+++ b/bin/build-master-status-from-mysql
@@ -20,28 +20,8 @@ fi
# shellcheck disable=SC2119
mysql_cleanup
-# shellcheck disable=SC2016
-{
- printf 'SELECT DISTINCT `package_sources`.`pkgbase`'
- printf ' FROM `package_sources`'
- mysql_join_package_sources_build_assignments
- mysql_join_build_assignments_binary_packages
- mysql_join_binary_packages_repositories
- printf ' WHERE `repositories`.`name`="deletion-list"'
- printf ' OR `binary_packages`.`is_to_be_deleted`;\n'
-} | \
- mysql_run_query | \
- sort > \
- "${tmp_dir}/deletion-list.mysql"
-sort "${work_dir}/deletion-list" > \
- "${tmp_dir}/deletion-list.file"
-
{
mysql_sanity_check || true
- diff -u \
- "${tmp_dir}/deletion-list.file" \
- "${tmp_dir}/deletion-list.mysql" || \
- true
} | \
sed '
s,^-.*$,<font color="#FF0000">\0</font>,
diff --git a/bin/cleanup b/bin/cleanup
index 7aaa39f..c9a8d2b 100755
--- a/bin/cleanup
+++ b/bin/cleanup
@@ -69,11 +69,4 @@ find "${build_log_directory}/success" -maxdepth 1 -type f -mtime +14 \
-not -exec zgrep -q '^+.*ELF file .* has text relocations' '{}' \; \
-delete
-# remove dependency graphs of packages on the deletion list
-sed '
- s|^|'"${webserver_directory}"'/graphs/|
- s|$|.png|
-' "${work_dir}/deletion-list" | \
- xargs -rn1 rm -f
-
exit 0
diff --git a/bin/get-package-updates b/bin/get-package-updates
index dcc9f3b..f4c53b4 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -99,17 +99,6 @@ fi
# delete_package package
# mark $package for deletion
delete_package() {
- # shellcheck disable=SC2016
- {
- printf 'SELECT DISTINCT `package_sources`.`pkgbase`'
- printf ' FROM `package_sources`'
- mysql_join_package_sources_build_assignments
- mysql_join_build_assignments_binary_packages
- printf ' WHERE `package_sources`.`pkgbase`=from_base64("%s")' \
- "$(printf '%s' "$1" | base64 -w0)"
- } | \
- mysql_run_query >> \
- "${work_dir}/deletion-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.
@@ -200,10 +189,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}/deletion-list" \
- "${work_dir}/deletion-list.new"
-
for repo in ${repo_names}; do
eval repo_path='"${repo_paths__'"${repo}"'}"'
eval old_repo_revision='"${old_repo_revisions__'"${repo}"'}"'
@@ -291,7 +276,6 @@ done | \
fi
fi
if [ "${mode}" = 'A' ] || [ "${mode}" = 'M' ]; then
- sed -i "/^$(str_to_regex "${package}")\$/d" "${work_dir}/deletion-list.new"
# shellcheck disable=SC2016
{
# delete old build assignment and associated binary packages
@@ -329,9 +313,6 @@ done | \
exit 1
done
-sort -u "${work_dir}/deletion-list.new" | \
- sponge "${work_dir}/deletion-list.new"
-
echo 'apply blacklisting'
# ignore blacklisted packages and dependent packages
# this is the first time when all the information is available and up to date
@@ -462,15 +443,10 @@ echo "${black_listed}" | \
delete_package "${package}"
done
-sort -u "${work_dir}/deletion-list.new" | \
- sponge "${work_dir}/deletion-list.new"
-
if [ -n "${test_exclusion}" ]; then
- # we should not actually update the build-list et. al, but solely print this difference:
- if diff --color -u "${work_dir}/deletion-list" "${work_dir}/deletion-list.new"; then
- printf 'If you put "%s" on the blacklist, no additional packages will end up on the deletion list.\n' "${test_exclusion}"
- fi
+ # TODO: reimplement test_exclusion with information from the database
+ >&2 echo 'sry, not yet done.'
exit 0
fi
@@ -504,11 +480,8 @@ mysql_find_build_assignment_loops
# Move the .new-files to the actual files
-{
- printf '%s\n' "deletion-list"
- # shellcheck disable=SC2086
- printf '%s.revision\n' ${repo_names}
-} | \
+# shellcheck disable=SC2086
+printf '%s.revision\n' ${repo_names} | \
while read -r file; do
mv "${work_dir}/${file}.new" "${work_dir}/${file}"
done
diff --git a/conf/default.conf b/conf/default.conf
index e8e0169..11483a0 100755
--- a/conf/default.conf
+++ b/conf/default.conf
@@ -133,7 +133,6 @@ if [ -z "${package_database_lock_file}" ]; then
fi
mkdir -p "${work_dir}"
-touch "${work_dir}/deletion-list"
for repo in ${repo_names}; do