From eb86441458f3d3ea0c289e099ab6a58c4731f1bd Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 14 Jul 2017 21:56:03 +0200 Subject: bin/seed-build-list, bin/build-master-status: repair some occurences of "build-list" --- bin/build-master-status | 4 ++-- bin/seed-build-list | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/build-master-status b/bin/build-master-status index 14939ba..62fc6e0 100755 --- a/bin/build-master-status +++ b/bin/build-master-status @@ -103,8 +103,8 @@ tasks="$( "${work_dir}/build-list" )" || true pending_packages="$( - tr ' ' '.' < \ - "${work_dir}"/build-list | \ + grep '^\S\+ \S\+ \S\+ \S\+$' "${work_dir}/build-list" | \ + tr ' ' '.' | \ while read -r package; do generate_package_metadata "${package}" &> /dev/null cat "${work_dir}/package-infos/${package%.*}.packages" diff --git a/bin/seed-build-list b/bin/seed-build-list index cf147c6..af85904 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -249,7 +249,8 @@ if ${update}; then fi # ignore packages already on the build list -awk '{print "old " $1 " " $2 " " $3 " " $4 " " $1}' "${work_dir}/build-list" > \ +grep -vxF 'break_loops' "${work_dir}/build-list" | \ + awk '{print "old " $1 " " $2 " " $3 " " $4 " " $1}' > \ "${tmp_dir}/build-list.old" # ignore packages on the deletion-list -- cgit v1.2.3-70-g09d2