From f3fa0664f9fcae9ad7259a6dfc7f86018c023307 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sun, 1 Sep 2024 15:12:10 +0200 Subject: [PATCH] fix for certain skipped packages still being in repo and not getting deleted --- .golangci.yaml | 1 + housekeeping.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 0d39c79..bcc543a 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -90,3 +90,4 @@ linters: # remove for new projects - errname - goerr113 + - depguard diff --git a/housekeeping.go b/housekeeping.go index 4f4abd1..2cf2966 100644 --- a/housekeeping.go +++ b/housekeeping.go @@ -241,8 +241,8 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error { if err != nil { return err } - case dbPkg.Status == dbpackage.StatusSkipped && dbPkg.RepoVersion != "" && strings.HasPrefix(dbPkg.SkipReason, "blacklisted"): - log.Infof("[HK] delete blacklisted package %s->%s", fullRepo, dbPkg.Pkgbase) + case dbPkg.Status == dbpackage.StatusSkipped && dbPkg.RepoVersion != "" && !strings.HasPrefix(dbPkg.SkipReason, "delayed"): + log.Infof("[HK] delete skipped package %s->%s", fullRepo, dbPkg.Pkgbase) pkg := &ProtoPackage{ FullRepo: fullRepo, March: march,