From 6a3499ca885ffc13f15a95fe33b5988b6f23009b Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 12 Dec 2016 21:46:44 +0100 Subject: [PATCH] Fix obscure rsync 3.0.6 skip-compress too verbose bug --- dev/{CODING_STYLE.TXT => CODING_CONVENTIONS.TXT} | 0 dev/n_osync.sh | 8 ++++++-- dev/tests/run_tests.sh | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) rename dev/{CODING_STYLE.TXT => CODING_CONVENTIONS.TXT} (100%) diff --git a/dev/CODING_STYLE.TXT b/dev/CODING_CONVENTIONS.TXT similarity index 100% rename from dev/CODING_STYLE.TXT rename to dev/CODING_CONVENTIONS.TXT diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 60ba56e..dfa79b0 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.2-beta3 -PROGRAM_BUILD=2016121205 +PROGRAM_BUILD=2016121206 IS_STABLE=no #TODO(low): is debug subset relevant in remote env @@ -1786,7 +1786,11 @@ function _SummaryFromFile { if [ -f "$summaryFile" ]; then while read -r file; do - Logger "$direction $replicaPath$(echo $file | awk '{for (i=2; i|^\." = Remove all lines that do not begin with <, > or . to deal with a bizarre bug involving rsync 3.0.6 / CentOS 6 and --skip-compress showing 'adding zip' line for every skipped compressed extension + if echo "$file" | grep -E "^<|^>|^\." > /dev/null 2>&1; then + # awk removes first part of line until space, then show all others + Logger "$direction $replicaPath$(echo $file | (grep -E "^<|^>|^\." || :) awk '{for (i=2; i