Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions cmd/chisel/cmd_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var infoTests = []infoTest{{
/dir/file: {}
myslice2:
hint: Hint for mypkg1_myslice2
v3-essential:
essential:
mypkg1_myslice1: {}
mypkg2_myslice: {arch: amd64}
`,
Expand All @@ -70,7 +70,7 @@ var infoTests = []infoTest{{
/dir/file: {}
myslice2:
hint: Hint for mypkg1_myslice2
v3-essential:
essential:
mypkg1_myslice1: {}
mypkg2_myslice: {arch: amd64}
---
Expand All @@ -93,7 +93,7 @@ var infoTests = []infoTest{{
/dir/file: {}
myslice2:
hint: Hint for mypkg1_myslice2
v3-essential:
essential:
mypkg1_myslice1: {}
mypkg2_myslice: {arch: amd64}
`,
Expand Down Expand Up @@ -143,7 +143,7 @@ var infoTests = []infoTest{{
}}

var infoRelease = map[string]string{
"chisel.yaml": string(testutil.DefaultChiselYaml),
"chisel.yaml": testutil.DefaultChiselYaml,
"slices/mypkg1.yaml": `
package: mypkg1
essential:
Expand Down
3 changes: 2 additions & 1 deletion internal/setup/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
// Release is a collection of package slices targeting a particular
// distribution version.
type Release struct {
Format string
Path string
Packages map[string]*Package
Archives map[string]*Archive
Expand Down Expand Up @@ -449,7 +450,7 @@ func readSlices(release *Release, baseDir, dirName string) error {
return fmt.Errorf("cannot read slice definition file: %v", err)
}

pkg, err := parsePackage(baseDir, pkgName, stripBase(baseDir, pkgPath), data)
pkg, err := parsePackage(release.Format, pkgName, stripBase(baseDir, pkgPath), data)
if err != nil {
return err
}
Expand Down
Loading
Loading