[Qa-jenkins-scm] [jenkins.debian.net] 01/02: fixup a5cdcc3b: reproducible: improve binary package display

[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 595080890b7890abff55bb10e3120a001943fcad
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Aug 2 17:36:27 2015 +0200

    fixup a5cdcc3b: reproducible: improve binary package display
---
 bin/reproducible_html_repository_comparison.sh | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh
index 55c62f0..e448a71 100755
--- a/bin/reproducible_html_repository_comparison.sh
+++ b/bin/reproducible_html_repository_comparison.sh
@@ -27,7 +27,7 @@ write_page "<p>These source packages are different from unstable in our apt repo
 write_page "deb http://reproducible.alioth.debian.org/debian/ ./"
 write_page "deb-src http://reproducible.alioth.debian.org/debian/ ./"
 write_page "</pre></p>"
-write_page "<p><table><tr><th>package</th><th>git repo</th><th>PTS link</th><th>usertagged bug</th><th>old versions in our repo<br />(needed for reproducing old builds)</th><th>version in our repo</th><th>version in 'testing'</th><th>version in 'unstable'</th><th>version in 'experimental'</th></tr>"
+write_page "<p><table><tr><th>package</th><th>git repo</th><th>PTS link</th><th>usertagged bug</th><th>old versions in our repo<br />(needed for reproducing old builds)</th><th>version in our repo<br />(available binary packages per architecture)</th><th>version in 'testing'</th><th>version in 'unstable'</th><th>version in 'experimental'</th></tr>"
 
 curl http://reproducible.alioth.debian.org/debian/Sources > $SOURCES
 curl http://reproducible.alioth.debian.org/debian/Packages > $PACKAGES
@@ -105,16 +105,24 @@ for PKG in $SOURCEPKGS ; do
 			CSID="$CSID$i<br />"
 		fi
 	done
-	BINARIES=""
+	CBINARIES=""
 	if [ ! -z "$BET" ] ; then
-		for ARCH in $ARCHS ; do
-			i="$(grep-dctrl -n -s Package -r -FPackage $PKG --and -FVersion $BET --and -FArchitecture all --or -FArchitecture $ARCH $PACKAGES|xargs -r echo)"
+		ONLYALL=true
+		for ARCH in all ${ARCHS} ; do
+			i="$(grep-dctrl -n -s Package -r -FPackage $PKG --and -FVersion $BET --and -FArchitecture $ARCH $PACKAGES|xargs -r echo)"
+			if [ "$ARCH" != "all" ] && [ ! -z "$i" ] ; then
+				ONLYALL=false
+			fi
+			echo "$ARCH: $i"
+		done
+		for ARCH in all ${ARCHS} ; do
+			i="$(grep-dctrl -n -s Package -r -FPackage $PKG --and -FVersion $BET --and -FArchitecture $ARCH $PACKAGES|xargs -r echo)"
 			if [ ! -z "$i" ] ; then
-				i="$ARCH+all: $i"
-			else
+				i="$ARCH: $i"
+			elif [ -z "$i" ] && [ "$ARCH" != "all" ] && ! $ONLYALL ; then
 				i="<span class=\"red\">no binaries for $ARCH</span>"
 			fi
-			BINARIES="$BINARIES<br />$i"
+			CBINARIES="$CBINARIES<br />$i"
 		done
 		BET="<span class=\"green\">$BET</span>"
 	else
@@ -187,7 +195,7 @@ for PKG in $SOURCEPKGS ; do
 	 done
 	write_page " <td><a href=\"$URL\">bugs</a></td>"
 	write_page " <td>$CRUFT</td>"
-	write_page " <td>$BET $BINARIES</td>"
+	write_page " <td>$BET $CBINARIES</td>"
 	write_page " <td>$CTEST</td>"
 	write_page " <td>$CSID</td>"
 	write_page " <td>$CEXP</td>"

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