From 3845fa8418060dce2370bfbdd7e10fcca7c02b28 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 3 Aug 2015 02:00:33 +0200 Subject: reproducible: split repo comparison into two tables: used and obsolete --- bin/reproducible_html_repository_comparison.sh | 65 +++++++++++++++----------- 1 file changed, 39 insertions(+), 26 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh index ab4abd21..3b8571cc 100755 --- a/bin/reproducible_html_repository_comparison.sh +++ b/bin/reproducible_html_repository_comparison.sh @@ -17,11 +17,17 @@ PAGE=index_${VIEW}.html SOURCES=$(mktemp --tmpdir=$TEMPDIR repo-comp-XXXXXXXXX) PACKAGES=$(mktemp --tmpdir=$TEMPDIR repo-comp-XXXXXXXXX) TMPFILE=$(mktemp --tmpdir=$TEMPDIR repo-comp-XXXXXXXXX) +TABLE_TODO=$(mktemp --tmpdir=$TEMPDIR repo-comp-XXXXXXXXX) +TABLE_DONE=$(mktemp --tmpdir=$TEMPDIR repo-comp-XXXXXXXXX) MODIFIED_IN_SID=0 MODIFIED_IN_EXP=0 BINNMUS_NEEDED=0 +write_row() { + echo "$1" >> $ROW +} + echo "$(date) - starting to write $PAGE page." write_page_header $VIEW "Comparison between the reproducible builds apt repository and regular Debian suites" write_page "

These source packages are different from unstable in our apt repository on alioth. They are available for testing using these sources.lists entries:

"
@@ -127,8 +133,10 @@ for PKG in $SOURCEPKGS ; do
 			CBINARIES="$CBINARIES
$i"
 		done
 		BET="$BET"
+		ROW=$TABLE_TODO
 	else
 		BET=" "
+		ROW=$TABLE_DONE
 	fi
 	if [ ! -z "$CRUFT" ] ; then
 		CRUFT="$(echo $CRUFT|sed 's# #
#g')"
@@ -136,8 +144,8 @@ for PKG in $SOURCEPKGS ; do
 	#
 	# write output
 	#
-	write_page "
src:$PKG
"
-	write_page " "
+	write_row "
src:$PKG
"
+	write_row " "
 	case $PKG in
 		strip-nondeterminism|debbindiff)
 			URL="http://anonscm.debian.org/cgit/reproducible/$PKG.git" ;;
@@ -146,41 +154,41 @@ for PKG in $SOURCEPKGS ; do
 	esac
 	curl $URL > $TMPFILE
 	if [ "$(grep "'error'>No repositories found" $TMPFILE 2>/dev/null)" ] ; then
-		write_page "$URL
(no git repository found)"
+		write_row "$URL
(no git repository found)"
 	elif [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then
 		URL="http://anonscm.debian.org/cgit/reproducible/$PKG.git/?h=merged/reproducible_builds"
 		curl $URL > $TMPFILE
 		if [ "$(grep "'error'>Invalid branch" $TMPFILE 2>/dev/null)" ] ; then
 			if ! $OBSOLETE_IN_SID ; then
-				write_page "$PKG.git
non-standard branch"
+				write_row "$PKG.git
non-standard branch"
 			else
-				write_page "$PKG.git
non-standard branch (but that is ok, our package aint't used in unstable)"
+				write_row "$PKG.git
non-standard branch (but that is ok, our package aint't used in unstable)"
 			fi
 		else
-			write_page "$PKG.git"
-			write_page "
(merged"
+			write_row "$PKG.git"
+			write_row "
(merged"
 			if $OBSOLETE_IN_TESTING ; then
-				write_page "and available in testing and unstable)"
+				write_row "and available in testing and unstable)"
 			elif $OBSOLETE_IN_SID ; then
-				write_page "and available in unstable)"
+				write_row "and available in unstable)"
 			elif $OBSOLETE_IN_EXP ; then
-				write_page "and available in experimental)"
+				write_row "and available in experimental)"
 			fi
 		fi
 	else
-		write_page "$PKG.git"
+		write_row "$PKG.git"
 		if [ "$PKG" != "strip-nondeterminism" ] && [ "$PKG" != "debbindiff" ] ; then
 			if $OBSOLETE_IN_TESTING && $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then
-				write_page "
(unused?"
-				write_page "
Then the branch should probably renamed."
+				write_row "
(unused?"
+				write_row "
Then the branch should probably renamed."
 			elif $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then
-				write_page "
(only used in testing, fixed in sid,"
-				write_page "
branch should probably renamed)"
+				write_row "
(only used in testing, fixed in sid,"
+				write_row "
branch should probably renamed)"
 			elif $OBSOLETE_IN_EXP ; then
-				write_page "
(only used in testing and unstable, fixed in experimental)"
+				write_row "
(only used in testing and unstable, fixed in experimental)"
 			fi
 		elif ( [ "$PKG" = "strip-nondeterminism" ] || [ "$PKG" = "debbindiff" ] ) && $OBSOLETE_IN_SID ; then
-			write_page "
(this repo is always used)"
+			write_row "
(this repo is always used)"
 		fi
 	fi
 	if ! $OBSOLETE_IN_SID ; then
@@ -189,20 +197,24 @@ for PKG in $SOURCEPKGS ; do
 	if ! $OBSOLETE_IN_EXP ; then
 		let "MODIFIED_IN_EXP+=1"
 	fi
-	write_page " "
-	write_page " PTS"
+	write_row " "
+	write_row " PTS"
 	URL="https://bugs.debian.org/cgi-bin/pkgreport.cgi?src=$PKG&users=reproducible-builds@lists.alioth.debian.org&archive=both"
 	for TAG in $USERTAGS ; do
 		URL="$URL&tag=$TAG"
 	 done
-	write_page " bugs"
-	write_page " $CRUFT"
-	write_page " $BET $CBINARIES"
-	write_page " $CTEST"
-	write_page " $CSID"
-	write_page " $CEXP"
-	write_page ""
+	write_row " bugs"
+	write_row " $CRUFT"
+	write_row " $BET $CBINARIES"
+	write_row " $CTEST"
+	write_row " $CSID"
+	write_row " $CEXP"
+	write_row ""
 done
+cat $TABLE_TODO >> $PAGE
+write_page "
"
+write_page "
"
+cat $TABLE_DONE >> $PAGE
 write_page "
package (obsolete in our repo)git repoPTS linkusertagged bugold versions in our repo
(needed for reproducing old builds)		version in our repo
(available binary packages per architecture)		version in 'testing'version in 'unstable'version in 'experimental'
"
 write_page_footer
 publish_page
@@ -212,4 +224,5 @@ echo "$BINNMUS_NEEDED" > /srv/reproducible-results/binnmus_needed.txt
 
 # cleanup
 rm $SOURCES $PACKAGES $TMPFILE
+rm $TABLE_TODO $TABLE_DONE
 
-- 
cgit v1.2.3-70-g09d2