Prechádzať zdrojové kódy

Better error messages for globbing errors

Jakob Borg 10 rokov pred
rodič
commit
2280566bca
2 zmenil súbory, kde vykonal 12 pridanie a 8 odobranie
  1. 6 4
      lib/versioner/simple.go
  2. 6 4
      lib/versioner/staggered.go

+ 6 - 4
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
 	}
 

+ 6 - 4
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
 	}