diff options
| author | Erich Eckner <git@eckner.net> | 2017-11-01 09:15:42 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-11-01 09:15:42 +0100 |
| commit | 305a85e6aefe2cfe2fd283c96f761f6c67083ba0 (patch) | |
| tree | a16cab00d0f9cdb3e9c9754b45b39ccb962c4c6c /bin/get-assignment | |
| parent | 4faad3f74c7930494fb4251173fad69274a8a96f (diff) | |
| download | builder-305a85e6aefe2cfe2fd283c96f761f6c67083ba0.tar.xz | |
remove residues of break_loop concerning
Diffstat (limited to 'bin/get-assignment')
| -rwxr-xr-x | bin/get-assignment | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/bin/get-assignment b/bin/get-assignment index 11aaf94..099f8b6 100755 --- a/bin/get-assignment +++ b/bin/get-assignment @@ -87,11 +87,6 @@ pending_packages=false while read -r package git_revision mod_git_revision repository; do - if [ -z "${git_revision}${mod_git_revision}${repository}" ] && \ - [ "${package}" = 'break_loops' ]; then - continue - fi - generate_package_metadata "${package}.${git_revision}.${mod_git_revision}.${repository}" if [ -f "${work_dir}/package-states/${package}.${git_revision}.${mod_git_revision}.${repository}.locked" ]; then @@ -133,7 +128,7 @@ for iteration in 'prefered' 'fresh' 'loops' 'broken'; do hand_out_broken=false hand_out_loop=false { - grep -vxF 'break_loops' "${work_dir}/build-list" + cat "${work_dir}/build-list" find "${work_dir}/package-states" -name '*.broken' -printf '%f\n' | \ sed ' s|\.\([^.]\+\)\.\([^.]\+\)\.\([^.]\+\)\.[^.]\+$| \1 \2 \3| @@ -160,15 +155,14 @@ for iteration in 'prefered' 'fresh' 'loops' 'broken'; do hand_out_blocked=false hand_out_broken=true hand_out_loop=true - grep -vxF 'break_loops' "${work_dir}/build-list" | \ - cut -d' ' -f1 | \ + cut -d' ' -f1 < \ + "${work_dir}/build-list" | \ sort -u > \ "${tmp_dir}/hand-out-only-these-packages" ;; esac - grep -vxF 'break_loops' "${work_dir}/build-list" | \ - cat -n | \ + cat -n "${work_dir}/build-list" | \ sort -k2,2 | \ join -1 1 -2 2 -o 2.1,2.2,2.3,2.4,2.5 "${tmp_dir}/hand-out-only-these-packages" - | \ sort -k1,1 | \ |