summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-08-31 00:12:22 +0200
committerHolger Levsen <holger@layer-acht.org>2015-08-31 00:12:22 +0200
commit63eb3ea3fb01a03cb5b86af3e398aa83859c30fb (patch)
tree81b1839a5bd5bcd0f92c0b96210a1a1c66f8dd0c
parent436a0a131774648f56139fc49ccdee37dd578bae (diff)
downloadjenkins.debian.net-63eb3ea3fb01a03cb5b86af3e398aa83859c30fb.tar.xz
reproducible: fix rsync
-rwxr-xr-xbin/reproducible_build.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 9864f296..ec78a04a 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -508,7 +508,8 @@ check_buildinfo() {
first_build
else
ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE} ${TMPDIR}
- rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 .
+ rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 $TMPDIR/
+ ls -R $TMPDIR
ssh -p $PORT1 $NODE1 "rm -r $TMPDIR"
fi
grep-dctrl -s Build-Environment -n ${SRCPACKAGE} ./b1/$BUILDINFO > $TMPFILE1
@@ -530,7 +531,8 @@ build_rebuild() {
first_build
else
ssh -p $PORT1 $NODE1 /srv/jenkins/bin/reproducible_build.sh 1 ${SRCPACKAGE} ${SUITE} ${TMPDIR}
- rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 .
+ rsync -e "ssh -p $PORT1" -r $NODE1:$TMPDIR/b1 $TMPDIR/
+ ls -R $TMPDIR
ssh -p $PORT1 $NODE1 "rm -r $TMPDIR"
fi
if [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
@@ -543,7 +545,8 @@ build_rebuild() {
second_build
else
ssh -p $PORT2 $NODE2 /srv/jenkins/bin/reproducible_build.sh 2 ${SRCPACKAGE} ${SUITE} ${TMPDIR}
- rsync -e "ssh -p $PORT2" -r $NODE2:$TMPDIR/b2 .
+ rsync -e "ssh -p $PORT2" -r $NODE2:$TMPDIR/b2 $TMPDIR/
+ ls -R $TMPDIR
ssh -p $PORT2 $NODE2 "rm -r $TMPDIR"
fi
if [ -f b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then