From 288f09ad0177e22992209e92f83b2c1babdfc8c9 Mon Sep 17 00:00:00 2001 From: Axel Kittenberger Date: Mon, 9 Jan 2017 11:14:23 +0100 Subject: [PATCH] a --- ChangeLog | 5 ++++- lsyncd.lua | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf5bc56..9b7de02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -2017-01-05: 2.1.1 +????-??-??: 2.2.2 + fix: checkgauge 'insist' + +2017-01-05: 2.2.1 enhancement: now always using filter lists with rysnc instead of include/exclude lists taking advantage of the new --delete-missing-args parameter to delete files on target. diff --git a/lsyncd.lua b/lsyncd.lua index 814e684..13da7ac 100644 --- a/lsyncd.lua +++ b/lsyncd.lua @@ -88,7 +88,7 @@ local settingsCheckgauge = statusInterval = true, logfacility = true, logident = true, - insisit = true, + insist = true, inotifyMode = true, maxProcesses = true, maxDelays = true, @@ -2091,9 +2091,8 @@ local Sync = ( function end -- a sub dir and not concerned about subdirs - if - self.config.subdirs == false - and path:sub( #self.source, -1 ):match( '[^/]+/?' ) + if self.config.subdirs == false + and path:sub( #self.source, -1 ):match( '[^/]+/?' ) then return false end @@ -2297,7 +2296,7 @@ local Sync = ( function if not path2 then -- simple test for single path events - if self.excludes:test(path) + if self.excludes:test( path ) then log( 'Exclude', @@ -3174,7 +3173,9 @@ local Syncs = ( function -- Tests if any sync is interested in a path. -- local function concerns - ( path ) + ( + path + ) for _, s in ipairs( syncsList ) do if s:concerns( path ) @@ -3286,9 +3287,9 @@ local Inotify = ( function ) log( 'Function', 'Inotify.addWatch( ', path, ' )' ) - if not Syncs.concerns(path) + if not Syncs.concerns( path ) then - log('Inotify', 'not concerning "',path,'"') + log('Inotify', 'not concerning "', path, '"') return end @@ -3296,11 +3297,12 @@ local Inotify = ( function -- registers the watch local inotifyMode = ( uSettings and uSettings.inotifyMode ) or ''; - local wd = lsyncd.inotify.addwatch( path, inotifyMode) ; + local wd = lsyncd.inotify.addwatch( path, inotifyMode ) ; if wd < 0 then log( 'Inotify','Unable to add watch "', path, '"' ) + return end