commit 98244f3ee1f546538c3d23f5bb84ba15fbb4c65d Author: Karsten Loesing karsten.loesing@gmx.net Date: Mon Jul 9 14:30:32 2018 +0200

Fix bug in tarball-creating script.

The bug was that some tarballs were not compressed in a run following an aborted run.

Fixes #26193. --- CHANGELOG.md | 2 ++ src/main/resources/create-tarballs.sh | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md index cf2cfd3..e914f2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes - Rename root package org.torproject.collector to org.torproject.metrics.collector and ..index to ..indexer. + - Fix a bug in the tarball-creation script where tarballs might not + have been compressed in a run following an aborted run.

# Changes in version 1.6.0 - 2018-05-23 diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index cd16b2d..b633826 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -99,10 +99,8 @@ done for (( i = 0 ; i < ${#TARBALLS[@]} ; i++ )); do echo `date` "Creating" ${TARBALLS[$i]}'.tar' tar chf ${TARBALLS[$i]}.tar ${TARBALLS[$i]} - if [ ! -f ${TARBALLS[$i]}.tar.xz ]; then - echo `date` "Compressing" ${TARBALLS[$i]}'.tar' - xz -9e ${TARBALLS[$i]}.tar - fi + echo `date` "Compressing" ${TARBALLS[$i]}'.tar' + xz -9e ${TARBALLS[$i]}.tar done

cd $OUTDIR/webstats/