From e4a8c6b2a3ae75d8dcab792ddf97bfecb5ab7cbf Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Tue, 19 Nov 2019 10:31:02 -0800 Subject: [PATCH] obs: Do not wait on excluded packages In case a package in obs is excluded ie no longer being built, do not wait for it to be built. Wait as long as there are packages being built or blocked on others to be built. Fixes #815 Signed-off-by: Archana Shinde --- obs-packaging/wait-obs.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/obs-packaging/wait-obs.sh b/obs-packaging/wait-obs.sh index cf8501d67b..914e32b62b 100755 --- a/obs-packaging/wait-obs.sh +++ b/obs-packaging/wait-obs.sh @@ -50,14 +50,15 @@ wait_finish_building() { echo "Project ${project} has blocked packages, waiting" continue fi - if echo "${out}" | grep 'code="excluded"'; then - echo "Project ${project} has excluded packages, waiting" - continue - fi if echo "${out}" | grep 'state="building"'; then echo "Project ${project} is still building, waiting" continue fi + if echo "${out}" | grep 'code="excluded"'; then + echo "Project ${project} has excluded packages left, quit waiting" + break + fi + echo "No jobs with building status were found" echo "${out}" break