[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible FreeBSD: exlcude symlinks when comparing results

[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 c966c3cdf9fb1f9d81da24b084b1895eee501a73
Author: Ed Maste <emaste at freebsd.org>
Date:   Thu Feb 23 10:13:24 2017 -0500

    reproducible FreeBSD: exlcude symlinks when comparing results
    
    The package repo contains a latest/ symlink to the actual package
    directory. Prune symlinks so we don't compare the same packages twice.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_freebsd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index c37055a..5aa27d5 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -61,7 +61,7 @@ run_diffoscope_on_results() {
 	fi
 	cd $TMPDIR/b1
 	tree .
-	for j in $(find * -type f |sort -u ) ; do
+	for j in $(find * -type l -prune -o -type f |sort -u ) ; do
 		ALL_FILES[$FREEBSD_TARGET]=$(( ${ALL_FILES[$FREEBSD_TARGET]}+1 ))
 		call_diffoscope . $j
 		get_filesize $j

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