summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-07-06 12:45:02 +0200
committerErich Eckner <git@eckner.net>2017-07-06 12:45:02 +0200
commitb4324cefc5b0bbde1f28fdd8586f361cf8c8f432 (patch)
treeec9e97f095f1014efb5ca9b10e3986e3a29abbfd
parentc942452a032863a92f6eaf057de90eb840aa05a0 (diff)
downloadbuilder-b4324cefc5b0bbde1f28fdd8586f361cf8c8f432.tar.xz
bin/cleanup: remove old blocked-markers, too
-rwxr-xr-xbin/cleanup10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/cleanup b/bin/cleanup
index f95a2a9..2c92058 100755
--- a/bin/cleanup
+++ b/bin/cleanup
@@ -16,16 +16,18 @@ if ! "${base_dir}/bin/sanity-check" -r; then
exit 1
fi
-# remove broken/locked markes of packages not on the buildlist anymore
+# remove blocked/broken/locked markes of packages not on the buildlist anymore
(
ls "${work_dir}/package-states" | \
- grep '\.broken$\|\.locked$' | \
+ grep '\.broken$\|\.b\?locked$' | \
sed '
- s|^\(.*\)\.\([^.]\+\)\.\([^.]\+\)\.\([^.]\+\)\.[^.]\+$|state \0 \1 \2 \3 \4|
+ s|^\(.*\)\.\([^.]\+\)\.\([^.]\+\)\.\([^.]\+\)\.\([^.]\+\)$|state \0 \1 \2 \3 \4 \5|
'
awk '{
- print "order " $1 "." $2 "." $3 "." $4 " " $1 " " $2 " " $3 " " $4
+ print "order " $1 "." $2 "." $3 "." $4 " " $1 " " $2 " " $3 " " $4 " broken"
+ print "order " $1 "." $2 "." $3 "." $4 " " $1 " " $2 " " $3 " " $4 " blocked"
+ print "order " $1 "." $2 "." $3 "." $4 " " $1 " " $2 " " $3 " " $4 " locked"
}' "${work_dir}/build-list"
) | \
sort -k3 | \