fix conditional pkg delete

ctrliq · Dec 11, 2023 · f7a66a1 · f7a66a1
1 parent 735e04b
commit f7a66a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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 {