summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-02-20 22:56:23 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-20 22:56:23 +0100
commita57ddf9087c5cb4b4a3e81ec576211c9c46ff05c (patch)
tree744a6b0c2d16128af9bf4d26ac8947f3e2a9df0a
parent1f3133f70767138afb6b6b7936bf446f4b096403 (diff)
downloadjenkins.debian.net-a57ddf9087c5cb4b4a3e81ec576211c9c46ff05c.tar.xz
update_jdn: fix trigger calculation
-rwxr-xr-xupdate_jdn.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index 1d7ad0fb..0f868aea 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -232,7 +232,7 @@ explain "Jenkins jobs updated."
# crappy tests for checking that jenkins-job-builder works correctly
#
#wc -m counts one byte too many, so we substract one
-let DEFINED_MY_TRIGGERS=$(grep my_trigger: *.yaml|wc -l)+$(grep my_trigger: *.yaml|grep , |xargs -r echo | sed 's/[^,]//g'| wc -m)-1
+let DEFINED_MY_TRIGGERS=$(grep my_trigger: *.yaml|grep -v "my_trigger: ''"|wc -l)+$(grep my_trigger: *.yaml|grep , |xargs -r echo | sed 's/[^,]//g'| wc -m)-1
DEFINED_DI_TRIGGERS=$(grep "defaults: d-i-manual-html" d-i.yaml|wc -l)
#DEFINED_REPRODUCIBLE_TRIGGERS=$(grep "^ defaults: reproducible$" reproducible.yaml|wc -l)
let DEFINED_TRIGGERS=DEFINED_MY_TRIGGERS+DEFINED_DI_TRIGGERS