From f7a66a18b47f549223473994744ea832b1ca73ae Mon Sep 17 00:00:00 2001
From: Cole Barnes <cbarnes@ciq.com>
Date: Fri, 8 Dec 2023 12:43:30 -0600
Subject: [PATCH] fix conditional pkg delete

---
 internal/plugins/static/pkg/staticrepository/api.go | 6 +++++-
 internal/plugins/yum/pkg/yumrepository/api.go       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/internal/plugins/static/pkg/staticrepository/api.go b/internal/plugins/static/pkg/staticrepository/api.go
index 30d605e..604d96c 100644
--- a/internal/plugins/static/pkg/staticrepository/api.go
+++ b/internal/plugins/static/pkg/staticrepository/api.go
@@ -34,7 +34,11 @@ func (h *Handler) DeleteRepository(ctx context.Context, repository string, delet
 		return werror.Wrap(gcode.ErrInternal, err)
 	}
 
-	if len(repositoryFiles) > 0 && deletePackages {
+	if len(repositoryFiles) > 0 {
+		if !deletePackages {
+			return werror.Wrap(gcode.ErrInternal, fmt.Errorf("err deleting static repository: files must be deleted from repository"))
+		}
+
 		for _, file := range repositoryFiles {
 			err = h.RemoveRepositoryFile(ctx, file.Tag)
 			if err != nil {
diff --git a/internal/plugins/yum/pkg/yumrepository/api.go b/internal/plugins/yum/pkg/yumrepository/api.go
index a24ff9f..4ce1ab0 100644
--- a/internal/plugins/yum/pkg/yumrepository/api.go
+++ b/internal/plugins/yum/pkg/yumrepository/api.go
@@ -94,7 +94,11 @@ func (h *Handler) DeleteRepository(ctx context.Context, repository string, delet
 		return werror.Wrap(gcode.ErrInternal, err)
 	}
 
-	if len(repositoryPackages) > 0 && deletePackages {
+	if len(repositoryPackages) > 0 {
+		if !deletePackages {
+			return werror.Wrap(gcode.ErrInternal, fmt.Errorf("err deleting yum repository: pkgs must be deleted from repository"))
+		}
+
 		for _, pkg := range repositoryPackages {
 			err = h.RemoveRepositoryPackageByTag(ctx, pkg.Tag)
 			if err != nil {