[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible FreeBSD: Fix tar argument order for tar 1.28

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit 2cf1bec3efcc9b50aa6eb3cb48d8780538116297
Author: Anders Kaseorg <andersk at mit.edu>
Date:   Sat Dec 10 15:40:08 2016 -0500

    reproducible FreeBSD: Fix tar argument order for tar 1.28
    
    --no-recursion now only applies to the following arguments.  See
    https://bugs.debian.org/829738.
    
    Signed-off-by: Anders Kaseorg <andersk at mit.edu>
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/reproducible_freebsd.sh                 | 2 +-
 hosts/freebsd-jenkins/usr/local/etc/sudoers | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index da5c407..6056ea5 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -32,7 +32,7 @@ save_freebsd_results() {
 	# copy results over
 	DUMMY_DATE="$(date -u +'%Y-%m-%d')T00:00:00Z"
 	$RSSH "sudo find $TMPDIR -newer $TMPDIR -exec touch -d '$DUMMY_DATE' {} \;"
-	$RSSH "sudo find $TMPDIR -print0 | LC_ALL=C sort -z | sudo tar --null -T - --no-recursion -cJf $TMPDIR.tar.xz"
+	$RSSH "sudo find $TMPDIR -print0 | LC_ALL=C sort -z | sudo tar --no-recursion --null -T - -cJf $TMPDIR.tar.xz"
 	$RSCP:$TMPDIR.tar.xz $TMPDIR/$RUN/$TARGET_NAME.tar.xz
 	$RSSH "sudo chflags -R noschg $TMPDIR ; sudo rm -r $TMPDIR $TMPDIR.tar.xz ; mkdir $TMPDIR"
 }
diff --git a/hosts/freebsd-jenkins/usr/local/etc/sudoers b/hosts/freebsd-jenkins/usr/local/etc/sudoers
index 5408368..06e26d9 100644
--- a/hosts/freebsd-jenkins/usr/local/etc/sudoers
+++ b/hosts/freebsd-jenkins/usr/local/etc/sudoers
@@ -104,7 +104,7 @@ jenkins ALL= NOPASSWD: /usr/bin/make -j ? buildworld, \
 	/usr/sbin/chown jenkins /usr/src, \
 	/usr/bin/find /srv/reproducible-results/* -newer /srv/reproducible-results/* -exec touch *, \
 	/usr/bin/find /srv/reproducible-results/* -print0, \
-	/usr/bin/tar --null -T - --no-recursion -cJf *.tar.xz, \
+	/usr/bin/tar --no-recursion --null -T - -cJf *.tar.xz, \
 	/usr/sbin/service ntpd start, \
 	/usr/sbin/service ntpd stop, \
 	/usr/sbin/service ntpd status, \

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