From 667536cea4074a81d787ba4ff6c711f6a22a060b Mon Sep 17 00:00:00 2001 From: Torben Giesselmann Date: Sun, 5 Mar 2023 14:18:08 -0800 Subject: [PATCH] forget: Allow neg. values in "--keep-within*" opts --- cmd/restic/cmd_forget.go | 10 ---------- cmd/restic/cmd_forget_test.go | 25 ------------------------- 2 files changed, 35 deletions(-) diff --git a/cmd/restic/cmd_forget.go b/cmd/restic/cmd_forget.go index 2d9341fac..82313c6ef 100644 --- a/cmd/restic/cmd_forget.go +++ b/cmd/restic/cmd_forget.go @@ -107,16 +107,6 @@ func verifyForgetOptions(opts *ForgetOptions) error { negValFound = true } - if !negValFound { - for _, d := range [6]restic.Duration{opts.Within, opts.WithinHourly, opts.WithinDaily, - opts.WithinMonthly, opts.WithinWeekly, opts.WithinYearly} { - if d.Hours < -1 || d.Days < -1 || d.Months < -1 || d.Years < -1 { - negValFound = true - break - } - } - } - if negValFound { return errors.Fatal("negative values other than -1 are not allowed for --keep-* options") } diff --git a/cmd/restic/cmd_forget_test.go b/cmd/restic/cmd_forget_test.go index 778df4549..c45d72815 100644 --- a/cmd/restic/cmd_forget_test.go +++ b/cmd/restic/cmd_forget_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "github.com/restic/restic/internal/restic" rtest "github.com/restic/restic/internal/test" ) @@ -16,30 +15,6 @@ func TestPreventNegativeForgetOptionValues(t *testing.T) { {Weekly: -2}, {Monthly: -2}, {Yearly: -2}, - {Within: restic.Duration{Hours: -2}}, - {Within: restic.Duration{Days: -2}}, - {Within: restic.Duration{Months: -2}}, - {Within: restic.Duration{Years: -2}}, - {WithinHourly: restic.Duration{Hours: -2}}, - {WithinHourly: restic.Duration{Days: -2}}, - {WithinHourly: restic.Duration{Months: -2}}, - {WithinHourly: restic.Duration{Years: -2}}, - {WithinDaily: restic.Duration{Hours: -2}}, - {WithinDaily: restic.Duration{Days: -2}}, - {WithinDaily: restic.Duration{Months: -2}}, - {WithinDaily: restic.Duration{Years: -2}}, - {WithinWeekly: restic.Duration{Hours: -2}}, - {WithinWeekly: restic.Duration{Days: -2}}, - {WithinWeekly: restic.Duration{Months: -2}}, - {WithinWeekly: restic.Duration{Years: -2}}, - {WithinMonthly: restic.Duration{Hours: -2}}, - {WithinMonthly: restic.Duration{Days: -2}}, - {WithinMonthly: restic.Duration{Months: -2}}, - {WithinMonthly: restic.Duration{Years: -2}}, - {WithinYearly: restic.Duration{Hours: -2}}, - {WithinYearly: restic.Duration{Days: -2}}, - {WithinYearly: restic.Duration{Months: -2}}, - {WithinYearly: restic.Duration{Years: -2}}, } for _, opts := range invalidForgetOpts {