summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2015-08-19 20:25:24 +0200
committerJakob Borg <jakob@nym.se>2015-08-19 20:25:24 +0200
commit59eeafbdfae7c7026ad65f2288595d6c50fd7b6a (patch)
treee8b701f045f34f646b89198f5937a6e26816ae7d
parent1487552b48b89e9465cdb23f58fe7c7e7ebffc93 (diff)
parentabc606608c2a6d34e5064f32265ad7b5c678c0af (diff)
Merge pull request #2174 from alex2108/master
Fix time zone error in staggered versioning (fixes #2165)
-rw-r--r--lib/versioner/staggered.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/versioner/staggered.go b/lib/versioner/staggered.go
index 1253713a7..1422a582b 100644
--- a/lib/versioner/staggered.go
+++ b/lib/versioner/staggered.go
@@ -182,7 +182,8 @@ func (v Staggered) expire(versions []string) {
continue
}
- versionTime, err := time.Parse(TimeFormat, filenameTag(file))
+ loc, _ := time.LoadLocation("Local")
+ versionTime, err := time.ParseInLocation(TimeFormat, filenameTag(file), loc)
if err != nil {
if debug {
l.Debugf("Versioner: file name %q is invalid: %v", file, err)