source: Make sure .File.Dir() ends with a slash

Updates #4190
This commit is contained in:
Bjørn Erik Pedersen
2017-12-28 11:32:02 +01:00
parent 3cdf19e9b7
commit 1b0780dbeb
5 changed files with 35 additions and 15 deletions

View File

@@ -162,9 +162,12 @@ func (fi *FileInfo) init() {
}
func (sp *SourceSpec) NewFileInfo(baseDir, filename string, fi os.FileInfo) *FileInfo {
dir, name := filepath.Split(filename)
dir = strings.TrimSuffix(dir, helpers.FilePathSeparator)
dir, name := filepath.Split(filename)
if !strings.HasSuffix(dir, helpers.FilePathSeparator) {
dir = dir + helpers.FilePathSeparator
}
baseDir = strings.TrimSuffix(baseDir, helpers.FilePathSeparator)
relDir := ""