bugfixes from testing

Signed-off-by: grokspawn <[email protected]>

Author: grokspawn

alpha/template/substitutes/substitutes.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"slices"
 
 	"k8s.io/apimachinery/pkg/util/yaml"
 
@@ -144,6 +145,15 @@ func (t Template) processSubstitution(ctx context.Context, cfg *declcfg.Declarat
 				entry.Replaces = substituteBundle.Name
 				entry.Skips = append(entry.Skips, substitution.Base)
 			}
+
+			// If this entry skips substitution.base, update it to skip substitution.name
+			// and remove substitution.base from the skips list
+			if entry.Skips != nil && slices.Contains(entry.Skips, substitution.Base) {
+				entry.Skips = append(entry.Skips, substituteBundle.Name)
+				entry.Skips = slices.DeleteFunc(entry.Skips, func(skip string) bool {
+					return skip == substitution.Base
+				})
+			}
 		}
 	}