From 62ae0182ea898f88445d9402010c3e0d9194d0f5 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 24 Oct 2017 12:27:39 +0200 Subject: bin/get-assignment: cleanup --- bin/get-assignment | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'bin/get-assignment') diff --git a/bin/get-assignment b/bin/get-assignment index be5c64e..ece83c7 100755 --- a/bin/get-assignment +++ b/bin/get-assignment @@ -39,9 +39,8 @@ hand_out_assignment() { echo "${slave}" > "${work_dir}/package-states/$1.$2.$3.$4.locked" # lock every loop this package breaks - find "${work_dir}/build-list.loops" -maxdepth 1 \ - -name 'loop_*' \ - -not -name 'loop_*.locked' \ + find "${work_dir}/build-list.loops" -maxdepth 1 -regextype grep \ + -regex '.*/loop_[0-9]\+' \ -exec grep -qxF "$1" '{}' \; \ -exec touch '{}.locked' \; \ -print >> \ @@ -155,8 +154,11 @@ done locked_packages=$( find "${work_dir}/package-states/" -maxdepth 1 -printf '%f\n' | \ - grep '\(\.[0-9a-f]\{40\}\)\{2\}\.[^\.\]\+\.locked$' | \ - sed 's|\(\.[0-9a-f]\{40\}\)\{2\}\.[^\.\]\+\.locked$||' + sed ' + s|\(\.[0-9a-f]\{40\}\)\{2\}\.[^\.\]\+\.locked$|| + t + d + ' ) grep -vxF 'break_loops' "${work_dir}/build-list" | \ -- cgit v1.2.3-54-g00ecf