[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible debian: dashboard: avoid printing disclaimer when stats are not even computed

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit f021dcca06d0e62306e271bf65f4495b60023841
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Jan 19 14:42:05 2017 +0100

    reproducible debian: dashboard: avoid printing disclaimer when stats are not even computed
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_html_dashboard.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index e6fe61f..faba215 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -304,12 +304,12 @@ _average_builds_per_day() {
 		local DAY_DIFFS="$(( ($(date -d "$DATE" +%s) - $(date -d "$OLDEST_BUILD" +%s)) / (60*60*24) ))"
 		local DISCLAIMER=""
 		local TIMESPAN="$TIMESPAN_RAW"
-		if [ $DAY_DIFFS -lt $TIMESPAN ]; then
-			# this is a new architecture, there are fewer days to compare to.
-			DISCLAIMER=" <span style=\"font-size: 0.8em;\">(in the last $DAY_DIFFS days)</span>"
-			TIMESPAN=$DAY_DIFF
-		fi
 		if [ $DAY_DIFFS -ge $MIN_DAYS ]; then
+			if [ $DAY_DIFFS -lt $TIMESPAN ]; then
+				# this is a new architecture, there are fewer days to compare to.
+				DISCLAIMER=" <span style=\"font-size: 0.8em;\">(in the last $DAY_DIFFS days)</span>"
+				TIMESPAN=$DAY_DIFFS
+			fi
 			# find stats for since the day before $TIMESPAN_RAW days ago,
 			# since no stats exist for today yet.
 			local TIMESPAN="$(echo $TIMESPAN-1|bc)"
@@ -318,7 +318,7 @@ _average_builds_per_day() {
 			RESULT=$(query_db "SELECT COUNT(r.build_date) FROM stats_build AS r WHERE r.build_date > '$TIMESPAN_DATE' AND r.architecture='$ARCH'")
 			RESULT="$(echo $RESULT/$TIMESPAN|bc)"
 		else
-			# very new arch with too few resulsts to care about stats
+			# very new arch with too few results to care about stats
 			RESULT=" "
 		fi
 		write_page "<td>${RESULT}${DISCLAIMER}</td>"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git