Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-11-01 09:15:42 +0100
committerErich Eckner <git@eckner.net>2017-11-01 09:15:42 +0100
commit305a85e6aefe2cfe2fd283c96f761f6c67083ba0 (patch)
treea16cab00d0f9cdb3e9c9754b45b39ccb962c4c6c
parent4faad3f74c7930494fb4251173fad69274a8a96f (diff)
remove residues of break_loop concerning
-rwxr-xr-xbin/build-master-status2
-rwxr-xr-xbin/calculate-dependent-packages3
-rwxr-xr-xbin/common-functions4
-rwxr-xr-xbin/delete-packages4
-rwxr-xr-xbin/get-assignment14
-rwxr-xr-xbin/get-package-updates7
-rwxr-xr-xbin/return-assignment6
-rwxr-xr-xbin/sanity-check10
-rwxr-xr-xbin/seed-build-list4
-rwxr-xr-xbin/show-dependencies14
-rwxr-xr-xbin/why-dont-you4
11 files changed, 28 insertions, 44 deletions
diff --git a/bin/build-master-status b/bin/build-master-status
index d4a7637..f901d0a 100755
--- a/bin/build-master-status
+++ b/bin/build-master-status
@@ -79,7 +79,7 @@ pending_packages=$(
)
next_tasks=$(
(
- grep -vxF 'break_loops' "${work_dir}/build-list"
+ cat "${work_dir}/build-list"
find "${work_dir}/package-states" -maxdepth 1 -name '*.broken' -printf '%f\n' | \
sed '
s|\.\([^.]\+\)\.\([^.]\+\)\.\([^.]\+\)\.[^.]\+$| \1 \2 \3|
diff --git a/bin/calculate-dependent-packages b/bin/calculate-dependent-packages
index 22a6ed9..6f3ec98 100755
--- a/bin/calculate-dependent-packages
+++ b/bin/calculate-dependent-packages
@@ -11,8 +11,7 @@ fi
tmp_dir=$(mktemp -d)
trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
-grep -vxF 'break_loops' "${work_dir}/build-list" | \
- sort -k1,1 -u > \
+sort -k1,1 -u "${work_dir}/build-list" > \
"${tmp_dir}/build-list"
while read -r pkg rev mod_rev repo; do
diff --git a/bin/common-functions b/bin/common-functions
index 1f8da75..7f7df3d 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -812,8 +812,8 @@ find_dependencies_on_build_list() {
(
cat "${work_dir}/package-infos/${package}.${git_revision}.${mod_git_revision}.${repository}.build-depends"
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $1 "." $2 "." $3 "." $4}' | \
+ awk '{print $1 "." $2 "." $3 "." $4}' < \
+ "${work_dir}/build-list" | \
sed "
s|^|${work_dir}/package-infos/|
s|\$|\.builds|
diff --git a/bin/delete-packages b/bin/delete-packages
index 9703804..752c3fa 100755
--- a/bin/delete-packages
+++ b/bin/delete-packages
@@ -210,8 +210,8 @@ exit 42
#
# # packages still on the build-list
#
-# grep -vxF 'break_loops' "${work_dir}/build-list" | \
-# tr ' ' '.' | \
+# tr ' ' '.' < \
+# "${work_dir}/build-list" | \
# sort -u > \
# "${tmp_dir}/keep-packages"
#
diff --git a/bin/get-assignment b/bin/get-assignment
index 11aaf94..099f8b6 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -87,11 +87,6 @@ pending_packages=false
while read -r package git_revision mod_git_revision repository; do
- if [ -z "${git_revision}${mod_git_revision}${repository}" ] && \
- [ "${package}" = 'break_loops' ]; then
- continue
- fi
-
generate_package_metadata "${package}.${git_revision}.${mod_git_revision}.${repository}"
if [ -f "${work_dir}/package-states/${package}.${git_revision}.${mod_git_revision}.${repository}.locked" ]; then
@@ -133,7 +128,7 @@ for iteration in 'prefered' 'fresh' 'loops' 'broken'; do
hand_out_broken=false
hand_out_loop=false
{
- grep -vxF 'break_loops' "${work_dir}/build-list"
+ cat "${work_dir}/build-list"
find "${work_dir}/package-states" -name '*.broken' -printf '%f\n' | \
sed '
s|\.\([^.]\+\)\.\([^.]\+\)\.\([^.]\+\)\.[^.]\+$| \1 \2 \3|
@@ -160,15 +155,14 @@ for iteration in 'prefered' 'fresh' 'loops' 'broken'; do
hand_out_blocked=false
hand_out_broken=true
hand_out_loop=true
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- cut -d' ' -f1 | \
+ cut -d' ' -f1 < \
+ "${work_dir}/build-list" | \
sort -u > \
"${tmp_dir}/hand-out-only-these-packages"
;;
esac
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- cat -n | \
+ cat -n "${work_dir}/build-list" | \
sort -k2,2 | \
join -1 1 -2 2 -o 2.1,2.2,2.3,2.4,2.5 "${tmp_dir}/hand-out-only-these-packages" - | \
sort -k1,1 | \
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 155e4d9..5c83f7f 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -141,10 +141,9 @@ 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.
-grep -vxF 'break_loops' \
- "${work_dir}/build-list" > \
- "${work_dir}/build-list.new" || \
- true
+cp \
+ "${work_dir}/build-list" \
+ "${work_dir}/build-list.new"
cp \
"${work_dir}/deletion-list" \
"${work_dir}/deletion-list.new"
diff --git a/bin/return-assignment b/bin/return-assignment
index 1a27b9f..f01e295 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -266,12 +266,6 @@ find "${work_dir}/build-list.loops" -maxdepth 1 \
-exec grep -qxF "$1" '{}' \; \
-exec rm '{}' '{}.locked' \;
-if ! find "${work_dir}/build-list.loops" -maxdepth 1 -printf '%f\n' | \
- grep -q '^loop_[0-9]\+$'; then
- # no loops left
- sed -i '/^break_loops$/d' "${work_dir}/build-list"
-fi
-
# remove package from build list
sed -i "/^$(str_to_regex "$1 $2 $3 $4")\$/d" "${work_dir}/build-list"
diff --git a/bin/sanity-check b/bin/sanity-check
index 700301c..37e2cd3 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -141,7 +141,7 @@ while [ $# -gt 0 ]; do
"${tmp_dir}/messages"
errors=$(
- grep -vn '^\S\+ [0-9a-f]\{40\} [0-9a-f]\{40\} \S\+$\|^break_loops$' "${work_dir}/build-list"
+ grep -vn '^\S\+ [0-9a-f]\{40\} [0-9a-f]\{40\} \S\+$' "${work_dir}/build-list"
) || true
if [ -n "${errors}" ]; then
if [ ${silence} -le 1 ]; then
@@ -153,8 +153,8 @@ while [ $# -gt 0 ]; do
fi
errors=$(
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $1}' | \
+ cut -d' ' -f1 < \
+ "${work_dir}/build-list" | \
sort | \
uniq -d
)
@@ -169,8 +169,8 @@ while [ $# -gt 0 ]; do
errors=$(
(
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $1}'
+ cut -d' ' -f1 < \
+ "${work_dir}/build-list"
cat "${work_dir}/deletion-list"
) | \
sort | \
diff --git a/bin/seed-build-list b/bin/seed-build-list
index 6490015..0428e27 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -237,8 +237,8 @@ fi
awk '{print $2 " " $3 " " $4 " " $1}' "${tmp_dir}/build-list.append"
# ignore packages on the build-list
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $2 " " $3 " " $4 " " $1}' | \
+ awk '{print $2 " " $3 " " $4 " " $1}' < \
+ "${work_dir}/build-list" | \
sed 'p'
# ignore packages on the deletion-list
diff --git a/bin/show-dependencies b/bin/show-dependencies
index 575350c..a4ad4f7 100755
--- a/bin/show-dependencies
+++ b/bin/show-dependencies
@@ -48,8 +48,8 @@ if [ $# -eq 0 ]; then
cat "${tmp_dir}/broken"
) | \
sort -u
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $1}' | \
+ cut -d' ' -f1 < \
+ "${work_dir}/build-list" | \
sort -u
) | \
sort | \
@@ -72,8 +72,8 @@ if [ $# -eq 0 ]; then
find "${webserver_directory}/graphs" -maxdepth 1 -name '*.png' -printf '%f\n' | \
sed 's|\.png$||'
(
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $1}'
+ cut -d' ' -f1 < \
+ "${work_dir}/build-list"
cat "${work_dir}/deletion-list"
) | \
sort -u
@@ -125,8 +125,7 @@ sort -u "${work_dir}/build-order" | \
grep '^\S\+ \S\+$' > \
"${tmp_dir}/original-build-order"
-grep -vxF 'break_loops' "${work_dir}/build-list" | \
- sort -k1,1 > \
+sort -k1,1 "${work_dir}/build-list" > \
"${tmp_dir}/build-list.sorted-by-package"
(
@@ -175,8 +174,7 @@ for target_package in "$@"; do
sort -k1,1 "${tmp_dir}/original-build-order" | \
join -1 1 -2 1 -o 2.1 - "${tmp_dir}/relevant-stuff"
# build list jobs themself
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $1}'
+ cut -d' ' -f1 < "${work_dir}/build-list"
) | \
sort -u | \
sponge "${tmp_dir}/relevant-stuff"
diff --git a/bin/why-dont-you b/bin/why-dont-you
index 8d0a283..a3776ab 100755
--- a/bin/why-dont-you
+++ b/bin/why-dont-you
@@ -68,8 +68,8 @@ case "${action}" in
fi
{
- grep -vxF 'break_loops' "${work_dir}/build-list" | \
- awk '{print $1 "." $2 "." $3 "." $4}'
+ awk '{print $1 "." $2 "." $3 "." $4}' < \
+ "${work_dir}/build-list"
if [ "${action}" = 'stabilize' ]; then
find "${work_dir}/package-states" -maxdepth 1 \( \
-name '*.done' -o \