Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2583 from calmh/globerrors 

Better error messages for globbing errors
This commit is contained in:
Audrius Butkevicius 2015-12-15 09:13:49 +00:00
parent 33173e76a0 2280566bca
commit fc6c4b8e16
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/versioner/simple.go
View File

@ -85,16 +85,18 @@ func (v Simple) Archive(filePath string) error {
} }
// Glob according to the new file~timestamp.ext pattern. // Glob according to the new file~timestamp.ext pattern.
newVersions, err := osutil.Glob(filepath.Join(dir, taggedFilename(file, TimeGlob))) pattern := filepath.Join(dir, taggedFilename(file, TimeGlob))
newVersions, err := osutil.Glob(pattern)
if err != nil { if err != nil {
l.Warnln("globbing:", err) l.Warnln("globbing:", err, "for", pattern)
return nil return nil
} }
// Also according to the old file.ext~timestamp pattern. // Also according to the old file.ext~timestamp pattern.
oldVersions, err := osutil.Glob(filepath.Join(dir, file+"~"+TimeGlob)) pattern = filepath.Join(dir, file+"~"+TimeGlob)
oldVersions, err := osutil.Glob(pattern)
if err != nil { if err != nil {
l.Warnln("globbing:", err) l.Warnln("globbing:", err, "for", pattern)
return nil return nil
} }

10
lib/versioner/staggered.go
View File

@ -258,16 +258,18 @@ func (v Staggered) Archive(filePath string) error {
} }
// Glob according to the new file~timestamp.ext pattern. // Glob according to the new file~timestamp.ext pattern.
newVersions, err := osutil.Glob(filepath.Join(dir, taggedFilename(file, TimeGlob))) pattern := filepath.Join(dir, taggedFilename(file, TimeGlob))
newVersions, err := osutil.Glob(pattern)
if err != nil { if err != nil {
l.Warnln("globbing:", err) l.Warnln("globbing:", err, "for", pattern)
return nil return nil
} }
// Also according to the old file.ext~timestamp pattern. // Also according to the old file.ext~timestamp pattern.
oldVersions, err := osutil.Glob(filepath.Join(dir, file+"~"+TimeGlob)) pattern = filepath.Join(dir, file+"~"+TimeGlob)
oldVersions, err := osutil.Glob(pattern)
if err != nil { if err != nil {
l.Warnln("globbing:", err) l.Warnln("globbing:", err, "for", pattern)
return nil return nil
} }