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-08-02 10:56:16 +0200
committerErich Eckner <git@eckner.net>2017-08-02 10:56:16 +0200
commit750e2ca34bc1063ee351b0a9be8e60a497812fd7 (patch)
treea03c098e4fe684e98b68acbc6e4d0cd8ee800483
parent1730c900834d2c221d719e889b507c9f2c680d40 (diff)
bin/show-dependencies: bugfixes
-rwxr-xr-xbin/show-dependencies53
1 files changed, 28 insertions, 25 deletions
diff --git a/bin/show-dependencies b/bin/show-dependencies
index 26b96a0..beb49b1 100755
--- a/bin/show-dependencies
+++ b/bin/show-dependencies
@@ -69,10 +69,11 @@ ls "${work_dir}/package-infos" | \
ls "${work_dir}/package-infos" | \
grep '\.groups$' | \
- sed "s|^|${work_dir}/package-infos/|" | \
- xargs -r cat | \
- sort -u > \
- "${tmp_dir}/known-groups"
+ while read -r pf; do
+ cat "${work_dir}/package-infos/${pf}" | \
+ xargs -r printf "${pf%.*.*.*.*} %s\n" >> \
+ "${tmp_dir}/known-groups"
+ done
ls "${work_dir}/package-infos" | \
grep '\.packages$' | \
@@ -84,21 +85,13 @@ ls "${work_dir}/package-infos" | \
for target_package in "$@"; do
- rm -f \
- "${tmp_dir}/knots" \
- "${tmp_dir}/build-order"
- touch "${tmp_dir}/knots"
-
output="${graphs_directory}/${target_package}.png"
- (
- grep " $(str_to_regex "${target_package}")\$" "${tmp_dir}/original-build-order" || \
- true
- printf '0 target-package %s\n' "${target_package}" >> \
- "${tmp_dir}/knots"
- ) | \
+ grep " $(str_to_regex "${target_package}")\$" "${tmp_dir}/original-build-order" | \
sort -u > \
"${tmp_dir}/build-order"
+ printf '0 target-package %s\n' "${target_package}" > \
+ "${tmp_dir}/knots"
last_sum=''
current_sum="$(sha512sum "${tmp_dir}/build-order")"
@@ -106,16 +99,21 @@ for target_package in "$@"; do
last_sum="${current_sum}"
- while read -r s t; do
- printf '%s %s\n' "${s}" "${t}"
- grep -h " $(str_to_regex "${s}")\$" \
+ awk '{print $1}' "${tmp_dir}/build-order" | \
+ sort -u > \
+ "${tmp_dir}/new"
+ (
+ cat \
"${tmp_dir}/original-build-order" \
- "${tmp_dir}/known-split-packages" \
- "${tmp_dir}/known-groups" || \
+ "${tmp_dir}/known-split-packages"
+ grep -v ' base\(-devel\)\?$' "${tmp_dir}/known-groups" || \
true
- done < \
- "${tmp_dir}/build-order" | \
- sort -u | \
+ ) | \
+ sort -k2,2 | \
+ join -1 2 -2 1 -o 1.1,1.2 - "${tmp_dir}/new" | \
+ sponge -a "${tmp_dir}/build-order"
+
+ sort -u "${tmp_dir}/build-order" | \
sponge "${tmp_dir}/build-order"
current_sum="$(sha512sum "${tmp_dir}/build-order")"
@@ -159,7 +157,8 @@ for target_package in "$@"; do
"${tmp_dir}/knots"
(
- cat "${tmp_dir}/known-groups"
+ awk '{print $2}' "${tmp_dir}/known-groups" | \
+ sort -u
tr ' ' '\n' < \
"${tmp_dir}/build-order" | \
sort -u
@@ -213,6 +212,7 @@ for target_package in "$@"; do
line_count="$(wc -l < "${tmp_dir}/input")"
if [ "${line_count}" -gt 500 ]; then
+ rm -f "${output}"
>&2 printf 'Skipping graph for "%s" - would be too big (%d).\n' \
"${target_package}" \
"${line_count}"
@@ -225,7 +225,10 @@ for target_package in "$@"; do
touch "${output}"
chmod 644 "${output}"
- dot -Tpng -o "${output}" "${tmp_dir}/input" || continue
+ if ! dot -Tpng -o "${output}" "${tmp_dir}/input"; then
+ rm -f "${output}"
+ continue
+ fi
done