Skip to content

fix: duplicate slice test + message #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niemeyer merged 1 commit into from
Mar 16, 2026
Merged

fix: duplicate slice test + message #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/setup/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ func readSlices(release *Release, baseDir, dirName string) error {
pkgName := match[1]
pkgPath := filepath.Join(dirName, entry.Name())
if pkg, ok := release.Packages[pkgName]; ok {
return fmt.Errorf("package %q slices defined more than once: %s and %s\")", pkgName, pkg.Path, pkgPath)
return fmt.Errorf("package %q slices defined more than once: %s and %s", pkgName, pkg.Path, stripBase(baseDir, pkgPath))
}
data, err := os.ReadFile(pkgPath)
if err != nil {
Expand Down
15 changes: 15 additions & 0 deletions internal/setup/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3742,6 +3742,21 @@ var setupTests = []setupTest{{
`,
},
relerror: `cannot parse slice mypkg_myslice1: essential expects a list`,
}, {
summary: "Package slices defined more than once",
input: map[string]string{
"slices/dir1/mypkg.yaml": `
package: mypkg
slices:
myslice:
`,
"slices/dir2/mypkg.yaml": `
package: mypkg
slices:
myslice2:
`,
},
relerror: `package "mypkg" slices defined more than once: slices/dir1/mypkg.yaml and slices/dir2/mypkg.yaml`,
}}

func (s *S) TestParseRelease(c *C) {
Expand Down
Loading