From 516eea88c7a73e1a189fd7d59fff453a96ce86ce Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 7 Jan 2016 10:27:20 +0100
Subject: Only do _hierarchy and _traces when EXTENDEDTRACE is full, or when
 upstream does it

---
 bin/ftpsync | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/bin/ftpsync b/bin/ftpsync
index c34d362..f43ec3d 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -229,16 +229,20 @@ tracefile() {
                 } > "${TRACEFILE}.new"
                 mv "${TRACEFILE}.new" "${TRACEFILE}"
 
-                {
-                    if [[ -e "${TO}/${TRACEHIERARCHY}.mirror" ]]; then
-                        cat "${TO}/${TRACEHIERARCHY}.mirror"
-                    fi
-                    echo "$(basename "${TRACEFILE}") ${MIRRORNAME} ${TRACEHOST} ${RSYNC_HOST}"
-                } > "${TO}/${TRACEHIERARCHY}".new
-                mv "${TO}/${TRACEHIERARCHY}".new "${TO}/${TRACEHIERARCHY}"
-                cp "${TO}/${TRACEHIERARCHY}" "${TO}/${TRACEHIERARCHY}.mirror"
-
-                (cd ${tracedir} && ls -1rt) | grep -E -v '^_|^master$' > "${TO}/${TRACELIST}"
+                if [[ full = ${EXTENDEDTRACE} ]] || [[ -e ${TO}/${TRACEHIERARCHY}.mirror ]]; then
+                    {
+                        if [[ -e ${TO}/${TRACEHIERARCHY}.mirror ]]; then
+                            cat ${TO}/${TRACEHIERARCHY}.mirror
+                        fi
+                        echo "$(basename "${TRACEFILE}") ${MIRRORNAME} ${TRACEHOST} ${RSYNC_HOST}"
+                    } > "${TO}/${TRACEHIERARCHY}".new
+                    mv "${TO}/${TRACEHIERARCHY}".new "${TO}/${TRACEHIERARCHY}"
+                    cp "${TO}/${TRACEHIERARCHY}" "${TO}/${TRACEHIERARCHY}.mirror"
+
+                    (cd ${tracedir} && ls -1rt) | grep -E -v '^_|^master$' > "${TO}/${TRACELIST}"
+                else
+                    rm -f "${TO}/${TRACEHIERARCHY}" "${TO}/${TRACELIST}"
+                fi
             fi
             ;;
         *)
-- 
cgit v1.2.3