WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix obscure rsync 3.0.6 skip-compress too verbose bug

This commit is contained in:
deajan 2016-12-12 21:46:44 +01:00
parent be18397865
commit 6a3499ca88
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
dev/CODING_STYLE.TXT → dev/CODING_CONVENTIONS.TXT
View File

8
dev/n_osync.sh
View File

@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.2-beta3 PROGRAM_VERSION=1.2-beta3
PROGRAM_BUILD=2016121205 PROGRAM_BUILD=2016121206
IS_STABLE=no IS_STABLE=no
#TODO(low): is debug subset relevant in remote env #TODO(low): is debug subset relevant in remote env
@ -1786,7 +1786,11 @@ function _SummaryFromFile {
if [ -f "$summaryFile" ]; then if [ -f "$summaryFile" ]; then
while read -r file; do while read -r file; do
Logger "$direction $replicaPath$(echo $file | awk '{for (i=2; i<NF; i++) printf $i " "; print $NF}')" "ALWAYS" # grep -E "^<|^>|^\." = 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<NF; i++) printf $i " "; print $NF}')" "ALWAYS"
fi
done < "$summaryFile" done < "$summaryFile"
fi fi
} }

2
dev/tests/run_tests.sh
View File

@ -895,6 +895,8 @@ function test_MultipleConflictBackups () {
for i in "${osyncParameters[@]}"; do for i in "${osyncParameters[@]}"; do
echo "Running with parameters [$î]."
cd "$OSYNC_DIR" cd "$OSYNC_DIR"
PrepareLocalDirs PrepareLocalDirs