From 2280566bca3f0a588a857c06bce69523d8bf5f77 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 15 Dec 2015 10:04:13 +0100 Subject: [PATCH] Better error messages for globbing errors --- lib/versioner/simple.go | 10 ++++++---- lib/versioner/staggered.go | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/versioner/simple.go b/lib/versioner/simple.go index 4ecfb0cae..c2622c433 100644 --- a/lib/versioner/simple.go +++ b/lib/versioner/simple.go @@ -85,16 +85,18 @@ func (v Simple) Archive(filePath string) error { } // 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 { - l.Warnln("globbing:", err) + l.Warnln("globbing:", err, "for", pattern) return nil } // 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 { - l.Warnln("globbing:", err) + l.Warnln("globbing:", err, "for", pattern) return nil } diff --git a/lib/versioner/staggered.go b/lib/versioner/staggered.go index 091caac1e..503419bda 100644 --- a/lib/versioner/staggered.go +++ b/lib/versioner/staggered.go @@ -258,16 +258,18 @@ func (v Staggered) Archive(filePath string) error { } // 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 { - l.Warnln("globbing:", err) + l.Warnln("globbing:", err, "for", pattern) return nil } // 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 { - l.Warnln("globbing:", err) + l.Warnln("globbing:", err, "for", pattern) return nil }