* fixing ssh port overwriting the last rsync option

* preparing 2.1.5
This commit is contained in:
Axel Kittenberger 2013-06-07 13:40:54 +02:00
parent 7fe13abab8
commit 3aa8ed1182
4 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,15 @@
07-07-2013: 2.1.5
enhancement: Added rsync options: bwlimit, timeout
fix: Specifying ssh port no longer overwrites the last rsync option
fix: rsync option password_file is now accepted
fix: onAttrib is accepted again
fix: -log Exec now prints now fully all arguments
fix: configure script lua detection now includes math lib to workaround
wrongly created "needs COMPAT_ALL" messages.
fix: repaired variable replacement for layer 3 scripts
change: a2x is no longer checked by configure script.
should not be needed when building from tarball
24-11-2012: 2.1.4
fix: making ssh custom port changes work with ssh and rsync

View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ(2.60)
AC_INIT(lsyncd, 2.1.4, axkibe@gmail.com)
AC_INIT(lsyncd, 2.1.5, axkibe@gmail.com)
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_MACRO_DIR([m4])

View File

@ -306,11 +306,11 @@ rsyncssh.prepare = function( config, level )
computedN = computedN + 2
local rsyncc = config.rsync._computed
rsyncc[ #rsyncc ] = '--rsh=ssh -p ' .. cssh.port
rsyncc[ #rsyncc + 1 ] = '--rsh=ssh -p ' .. cssh.port
end
-- appends a slash to the targetdir if missing
if string.sub(config.targetdir, -1) ~= '/' then
if string.sub( config.targetdir, -1 ) ~= '/' then
config.targetdir = config.targetdir .. '/'
end

View File

@ -30,7 +30,7 @@ if lsyncd_version then
lsyncd.terminate( -1 )
end
lsyncd_version = '2.1.4'
lsyncd_version = '2.1.5'
--
-- Hides the core interface from user scripts.