From 57b32d28fae90b4f899d4bacfb1eff09a849681f Mon Sep 17 00:00:00 2001 From: deajan Date: Sat, 6 Aug 2016 13:27:37 +0200 Subject: [PATCH] Rebuilt targets --- CHANGELOG.md | 1 + dev/debug_osync.sh | 4 +--- osync.sh | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a130d16..3085236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ RECENT CHANGES XX Xxx 2016: osync v1.1.1 released +- Fixed bogus rsync pattern additions - Fixed soft deletion always enabled on target - Fixed problem with attributes file list function - Fixed deletion propagation code diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index 6be5bb5..4f778c6 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -7,7 +7,7 @@ PROGRAM_VERSION=1.1.1 PROGRAM_BUILD=2016080203 IS_STABLE=yes -## FUNC_BUILD=2016071902 +## FUNC_BUILD=2016071902-b ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -1041,8 +1041,6 @@ function RsyncPatternsFromAdd { local pattern_from="${2}" __CheckArguments 2 $# ${FUNCNAME[0]} "$@" #__WITH_PARANOIA_DEBUG - local pattern_from= - ## Check if the exclude list has a full path, and if not, add the config file path if there is one if [ "$(basename $pattern_from)" == "$pattern_from" ]; then pattern_from="$(dirname $CONFIG_FILE)/$pattern_from" diff --git a/osync.sh b/osync.sh index 6615ee6..4fa3e38 100755 --- a/osync.sh +++ b/osync.sh @@ -7,7 +7,7 @@ PROGRAM_VERSION=1.1.1 PROGRAM_BUILD=2016080203 IS_STABLE=yes -## FUNC_BUILD=2016071902 +## FUNC_BUILD=2016071902-b ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode @@ -972,8 +972,6 @@ function RsyncPatternsFromAdd { local pattern_type="${1}" local pattern_from="${2}" - local pattern_from= - ## Check if the exclude list has a full path, and if not, add the config file path if there is one if [ "$(basename $pattern_from)" == "$pattern_from" ]; then pattern_from="$(dirname $CONFIG_FILE)/$pattern_from"