[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible arch: correctly preserve 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 20ab7c3aec153ce758686c9c67db86c46b449670
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Oct 16 19:51:17 2015 +0200

    reproducible arch: correctly preserve results
---
 bin/reproducible_build_arch_pkg.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index e0534fd..51cd6e3 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -138,15 +138,15 @@ elif [ "$1" = "1" ] || [ "$1" = "2" ] ; then
 	TMPDIR="$3"
 	[ -d $TMPDIR ] || mkdir -p $TMPDIR
 	cd $TMPDIR
-	mkdir -p b$MODE/archlinux/
+	mkdir -p b$MODE/archlinux/$SRCPACKAGE
 	if [ "$MODE" = "1" ] ; then
 		first_build
 	else
 		second_build
 	fi
-	# delete source package before providing build results for rsyncing
-	rm /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE -r
-	mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR) $TMPDIR/b$MODE/archlinux/$SRCPACKAGE
+	# preserve results and delete build directory
+	mv -v /tmp/$SRCPACKAGE-$(basename $TMPDIR)/$SRCPACKAGE/*-x86_64.pkg.tar.?? $TMPDIR/b$MODE/archlinux/$SRCPACKAGE
+	rm -r /tmp/$SRCPACKAGE-$(basename $TMPDIR)/
 	echo "$(date -u) - build #$MODE for $SRCPACKAGE on $HOSTNAME done."
 	exit 0
 fi

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