github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-27 10:50:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

local: Fix interaction between -x flag and --max-depth - fixes #1126

Browse Source 
This was causing the by directory sync to ignore the -x flag because
it was putting directories into the listing which should have been
excluded.
This commit is contained in:
Nick Craig-Wood 2017-02-13 09:24:29 +00:00
parent 7047c67a5e
commit 370f242fa2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
local/local.go
View File

@ -222,7 +222,7 @@ func (f *Fs) list(out fs.ListOpts, remote string, dirpath string, level int) (su
if fi.IsDir() { if fi.IsDir() {
// Ignore directories which are symlinks. These are junction points under windows which // Ignore directories which are symlinks. These are junction points under windows which
// are kind of a souped up symlink. Unix doesn't have directories which are symlinks. // are kind of a souped up symlink. Unix doesn't have directories which are symlinks.
if (mode&os.ModeSymlink) == 0 && out.IncludeDirectory(newRemote) { if (mode&os.ModeSymlink) == 0 && out.IncludeDirectory(newRemote) && f.dev == readDevice(fi) {
dir := &fs.Dir{ dir := &fs.Dir{
Name: f.cleanRemote(newRemote), Name: f.cleanRemote(newRemote),
When: fi.ModTime(), When: fi.ModTime(),
@ -232,7 +232,7 @@ func (f *Fs) list(out fs.ListOpts, remote string, dirpath string, level int) (su
if out.AddDir(dir) { if out.AddDir(dir) {
return nil return nil
} }
if level > 0 && f.dev == readDevice(fi) { if level > 0 {
subdirs = append(subdirs, listArgs{remote: newRemote, dirpath: newPath, level: level - 1}) subdirs = append(subdirs, listArgs{remote: newRemote, dirpath: newPath, level: level - 1})
} }
} }