Merge pull request #496 from databacker/accept-tz-regex-prune

deitch · web-flow · commit 423679ab7245 · 2026-01-12T14:39:56.000+02:00
accept TZ for RFC3339 in prune regex
diff --git a/pkg/core/prune.go b/pkg/core/prune.go
@@ -18,7 +18,7 @@ import (
 )
 
 // filenameRE is a regular expression to match a backup filename
-var filenameRE = regexp.MustCompile(`^db_backup_(\d{4})-(\d{2})-(\d{2})T(\d{2})[:-](\d{2})[:-](\d{2})Z\.\w+$`)
+var filenameRE = regexp.MustCompile(`^db_backup_(\d{4})-(\d{2})-(\d{2})T(\d{2})[:-](\d{2})[:-](\d{2})(Z|\-\d{2}:\d{2})\.\w+$`)
 
 // Prune prune older backups
 func (e *Executor) Prune(ctx context.Context, opts PruneOptions) error {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`// filenameRE is a regular expression to match a backup filename`
`21`		-var filenameRE = regexp.MustCompile(`^db_backup_(\d{4})-(\d{2})-(\d{2})T(\d{2})[:-](\d{2})[:-](\d{2})Z\.\w+$`)
	`21`	+var filenameRE = regexp.MustCompile(`^db_backup_(\d{4})-(\d{2})-(\d{2})T(\d{2})[:-](\d{2})[:-](\d{2})(Z\|\-\d{2}:\d{2})\.\w+$`)
`22`	`22`
`23`	`23`	`// Prune prune older backups`
`24`	`24`	`func (e *Executor) Prune(ctx context.Context, opts PruneOptions) error {`