Skip to content

Commit 4f7f18d

Browse files
committed
bugfix: cut does not infer the architecture properly
1 parent 3e6e615 commit 4f7f18d

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

‎cmd/chisel/cmd_cut.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"github.com/canonical/chisel/internal/archive"
1111
"github.com/canonical/chisel/internal/cache"
12+
"github.com/canonical/chisel/internal/deb"
1213
"github.com/canonical/chisel/internal/setup"
1314
"github.com/canonical/chisel/internal/slicer"
1415
)
@@ -57,6 +58,14 @@ func (cmd *cmdCut) Execute(args []string) error {
5758
}
5859
sliceKeys[i] = sliceKey
5960
}
61+
arch := cmd.Arch
62+
if arch == "" {
63+
darch, err := deb.InferArch()
64+
if err != nil {
65+
return err
66+
}
67+
arch = darch
68+
}
6069

6170
release, err := obtainRelease(cmd.Release)
6271
if err != nil {
@@ -73,7 +82,7 @@ func (cmd *cmdCut) Execute(args []string) error {
7382
}
7483
}
7584

76-
selection, err := setup.Select(release, sliceKeys, cmd.Arch)
85+
selection, err := setup.Select(release, sliceKeys, arch)
7786
if err != nil {
7887
return err
7988
}
@@ -83,7 +92,7 @@ func (cmd *cmdCut) Execute(args []string) error {
8392
openArchive, err := archive.Open(&archive.Options{
8493
Label: archiveName,
8594
Version: archiveInfo.Version,
86-
Arch: cmd.Arch,
95+
Arch: arch,
8796
Suites: archiveInfo.Suites,
8897
Components: archiveInfo.Components,
8998
Pro: archiveInfo.Pro,

0 commit comments

Comments
 (0)