[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: treat disorderfs specially as long we need it

[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 149ab897709dd1b2a44fc1fb1578d83acb7c6baa
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 23 10:38:18 2015 +0200

    reproducible: treat disorderfs specially as long we need it
---
 bin/reproducible_build.sh                      | 2 --
 bin/reproducible_html_repository_comparison.sh | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 5c2a42a..5ff79de 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -708,8 +708,6 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
 	TMPDIR="$4"
 	[ -d $TMPDIR ] || mkdir -p $TMPDIR
 	cd $TMPDIR
-	# used to catch race conditions when the same package is being built by two parallel jobs
-	LOCKFILE="/tmp/reproducible-lockfile-${SUITE}-${ARCH}-${SRCPACKAGE}"
 	get_source_package
 	mkdir b$MODE
 	if [ "$MODE" = "1" ] ; then
diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh
index 0145e1d..d957358 100755
--- a/bin/reproducible_html_repository_comparison.sh
+++ b/bin/reproducible_html_repository_comparison.sh
@@ -154,7 +154,7 @@ for PKG in $SOURCEPKGS ; do
 		debbindiff)
 			URL="http://anonscm.debian.org/cgit/reproducible/diffoscope.git"
 			GIT="diffoscope.git" ;;
-		strip-nondeterminism|diffoscope)
+		strip-nondeterminism|diffoscope|disorderfs)
 			URL="http://anonscm.debian.org/cgit/reproducible/$GIT" ;;
 		*)
 			URL="http://anonscm.debian.org/cgit/reproducible/$GIT/?h=pu/reproducible_builds" ;;
@@ -184,7 +184,7 @@ for PKG in $SOURCEPKGS ; do
 		fi
 	else
 		write_row "<a href=\"$URL\">$GIT</a>"
-		if [ "$PKG" != "strip-nondeterminism" ] && [ "$PKG" != "diffoscope" ] && [ "$PKG" != "debbindiff" ] ; then
+		if [ "$PKG" != "strip-nondeterminism" ] && [ "$PKG" != "diffoscope" ] && [ "$PKG" != "debbindiff" ] && [ "$PKG" != "disorderfs" ] ; then
 			if $OBSOLETE_IN_TESTING && $OBSOLETE_IN_SID && $OBSOLETE_IN_EXP ; then
 				write_row "<br />(unused?"
 				write_row "<br /><span class=\"purple\">Then the branch should probably renamed.</span>)"
@@ -194,6 +194,8 @@ for PKG in $SOURCEPKGS ; do
 			elif $OBSOLETE_IN_EXP ; then
 				write_row "<br />(only used in testing and unstable, fixed in experimental)"
 			fi
+		elif [ "$PKG" = "disorderfs" ] ; then
+			write_row "<br />(only used to modify the build environment in the 2nd build)"
 		elif ( [ "$PKG" = "strip-nondeterminism" ] || [ "$PKG" = "diffoscope" ] ) && $OBSOLETE_IN_SID ; then
 			write_row "<br />(this repo is always used)"
 		elif [ "$PKG" = "debbindiff" ] && $OBSOLETE_IN_SID ; then

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