perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd, lib: Fix ineffectual assignments (ineffasign) and comment spelling

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3405
This commit is contained in:
Jakob Borg
2016-07-15 14:23:20 +00:00
parent e3ccc45d19
commit 3176629410
11 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/model/model.go
View File

@@ -1293,7 +1293,7 @@ func (m *Model) localChangeDetected(folder, path string, files []protocol.FileIn
objType := "file"
action := "modified"
// If our local vector is verison 1 AND it is the only version
// If our local vector is version 1 AND it is the only version
// vector so far seen for this file then it is a new file. Else if
// it is > 1 it's not new, and if it is 1 but another shortId
// version vector exists then it is new for us but created elsewhere
@@ -1311,11 +1311,8 @@ func (m *Model) localChangeDetected(folder, path string, files []protocol.FileIn
action = "deleted"
}
// If the file is a level or more deep then the forward slash seperator is embedded
// in the filename and makes the path look wierd on windows, so lets fix it
filename := filepath.FromSlash(file.Name)
// And append it to the filepath
path := filepath.Join(path, filename)
// The full file path, adjusted to the local path separator character.
path := filepath.Join(path, filepath.FromSlash(file.Name))
events.Default.Log(events.LocalChangeDetected, map[string]string{
"folder": folder,