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

golint: FNM_FOOBAR -> fnmatch.FooBar

Browse Source
This commit is contained in:
Jakob Borg
2015-04-04 22:03:03 +02:00
parent b08ee3ff81
commit 6e317896e9
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/ignore/ignore.go
View File

@@ -200,20 +200,20 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) ([]
if strings.HasPrefix(line, "/") {
// Pattern is rooted in the current dir only
exp, err := fnmatch.Convert(line[1:], fnmatch.FNM_PATHNAME)
exp, err := fnmatch.Convert(line[1:], fnmatch.PathName)
if err != nil {
return fmt.Errorf("Invalid pattern %q in ignore file", line)
}
patterns = append(patterns, Pattern{exp, include})
} else if strings.HasPrefix(line, "**/") {
// Add the pattern as is, and without **/ so it matches in current dir
exp, err := fnmatch.Convert(line, fnmatch.FNM_PATHNAME)
exp, err := fnmatch.Convert(line, fnmatch.PathName)
if err != nil {
return fmt.Errorf("Invalid pattern %q in ignore file", line)
}
patterns = append(patterns, Pattern{exp, include})
exp, err = fnmatch.Convert(line[3:], fnmatch.FNM_PATHNAME)
exp, err = fnmatch.Convert(line[3:], fnmatch.PathName)
if err != nil {
return fmt.Errorf("Invalid pattern %q in ignore file", line)
}
@@ -228,13 +228,13 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) ([]
} else {
// Path name or pattern, add it so it matches files both in
// current directory and subdirs.
exp, err := fnmatch.Convert(line, fnmatch.FNM_PATHNAME)
exp, err := fnmatch.Convert(line, fnmatch.PathName)
if err != nil {
return fmt.Errorf("Invalid pattern %q in ignore file", line)
}
patterns = append(patterns, Pattern{exp, include})
exp, err = fnmatch.Convert("**/"+line, fnmatch.FNM_PATHNAME)
exp, err = fnmatch.Convert("**/"+line, fnmatch.PathName)
if err != nil {
return fmt.Errorf("Invalid pattern %q in ignore file", line)
}