From 0ec01f4e78229f1424c7c64465291d52af5bfad0 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 3 May 2015 10:36:46 +0200 Subject: [PATCH] Distinguish files with same name but different extension in staggered versioner (fixes #1738) --- internal/versioner/staggered.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/versioner/staggered.go b/internal/versioner/staggered.go index d49a68a1a..ca1908fa6 100644 --- a/internal/versioner/staggered.go +++ b/internal/versioner/staggered.go @@ -116,10 +116,11 @@ func (v Staggered) clean() { } } else { // Regular file, or possibly a symlink. - - extension := filenameTag(path) + ext := filepath.Ext(path) + versionTag := filenameTag(path) dir := filepath.Dir(path) - name := path[:len(path)-len(extension)-1] + withoutExt := path[:len(path)-len(ext)-len(versionTag)-1] + name := withoutExt + ext filesPerDir[dir]++ versionsPerFile[name] = append(versionsPerFile[name], path)