[Qa-jenkins-scm] [jenkins.debian.net] 01/05: reproducible archlinux: change order of columns in results table

[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 fb4521531a7f7aadb8003407eeec3d1b1e5bba8c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Dec 9 11:03:47 2015 +0100

    reproducible archlinux: change order of columns in results table
---
 bin/reproducible_html_archlinux.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index 735336c..3edeabc 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -37,18 +37,10 @@ cat > $PAGE <<- EOF
 EOF
 write_page_intro 'Arch Linux'
 write_explaination_table 'Arch Linux'
-write_page "    <table><tr><th>source package</th><th>test date</th><th>1st build log</th><th>2nd build log</th><th>diffoscope output for binary packages</th></tr>"
+write_page "    <table><tr><th>source package</th><th>test result</th><th>test date</th><th>1st build log</th><th>2nd build log</th></tr>"
 for PKG in $(find $ARCHBASE/* -maxdepth 1 -type d -exec basename {} \;) ; do
 	write_page "     <tr>"
 	write_page "      <td>$PKG</td>"
-	write_page "      <td>$(ls -dl $ARCHBASE/$PKG/build1.log|cut -d " " -f6-8)</td>"
-	for LOG in build1.log build2.log ; do
-		if [ -f $ARCHBASE/$PKG/$LOG ] ; then
-			write_page "      <td><a href=\"/archlinux/$PKG/$LOG\">$LOG</a></td>"
-		else
-			write_page "      <td> </td>"
-		fi
-	done
 	if [ -z "$(cd $ARCHBASE/$PKG/ ; ls *.pkg.tar.xz.html 2>/dev/null)" ] ; then
 		if [ ! -z "$(grep '==> ERROR: Could not resolve all dependencies' $ARCHBASE/$PKG/build1.log)" ] ; then
 			write_page "      <td>could not resolve dependencies</td>"
@@ -74,6 +66,14 @@ for PKG in $(find $ARCHBASE/* -maxdepth 1 -type d -exec basename {} \;) ; do
 		done
 		write_page "      </td>"
 	fi
+	write_page "      <td>$(ls -dl $ARCHBASE/$PKG/build1.log|cut -d " " -f6-8)</td>"
+	for LOG in build1.log build2.log ; do
+		if [ -f $ARCHBASE/$PKG/$LOG ] ; then
+			write_page "      <td><a href=\"/archlinux/$PKG/$LOG\">$LOG</a></td>"
+		else
+			write_page "      <td> </td>"
+		fi
+	done
 	write_page "     </tr>"
 done
 write_page "    </table>"

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