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-09-29 15:06:27 +0200
committerErich Eckner <git@eckner.net>2017-09-29 15:06:27 +0200
commitb3e13420947a3bddb21d5c52eccf790274c4728f (patch)
treee8bea4451c9fbdee6a621e48ee076c55c09cdc67
parentc538eb3db6e8aab65d2d7c9b3db1fb5b6ecb3b73 (diff)
bin/show-dependencies: bugfixes in case of loops
-rwxr-xr-xbin/show-dependencies13
1 files changed, 8 insertions, 5 deletions
diff --git a/bin/show-dependencies b/bin/show-dependencies
index a1ac171..26f2eeb 100755
--- a/bin/show-dependencies
+++ b/bin/show-dependencies
@@ -48,7 +48,8 @@ if [ $# -eq 0 ]; then
cat "${tmp_dir}/broken"
) | \
sort -u
- awk '{print $1}' "${work_dir}/build-list" | \
+ grep -vxF 'break_loops' "${work_dir}/build-list" | \
+ awk '{print $1}' | \
sort -u
) | \
sort | \
@@ -71,8 +72,8 @@ if [ $# -eq 0 ]; then
find "${webserver_directory}/graphs" -maxdepth 1 -name '*.png' -printf '%f\n' | \
sed 's|\.png$||'
(
- awk '{print $1}' < \
- "${work_dir}/build-list"
+ grep -vxF 'break_loops' "${work_dir}/build-list" | \
+ awk '{print $1}'
cat "${work_dir}/deletion-list"
) | \
sort -u
@@ -118,7 +119,8 @@ sort -u "${work_dir}/build-order" | \
grep '^\S\+ \S\+$' > \
"${tmp_dir}/original-build-order"
-sort -k1,1 "${work_dir}/build-list" > \
+grep -vxF 'break_loops' "${work_dir}/build-list" | \
+ sort -k1,1 > \
"${tmp_dir}/build-list.sorted-by-package"
(
@@ -167,7 +169,8 @@ 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
- awk '{print $1}' "${work_dir}/build-list"
+ grep -vxF 'break_loops' "${work_dir}/build-list" | \
+ awk '{print $1}'
) | \
sort -u | \
sponge "${tmp_dir}/relevant-stuff"