Skip to content

Commit 99b9496

Browse files
committed
change output and remove releaseLabel
1 parent 1186a98 commit 99b9496

3 files changed

Lines changed: 13 additions & 15 deletions

File tree

‎cmd/chisel/cmd_cut.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (cmd *cmdCut) Execute(args []string) error {
5252
sliceKeys[i] = sliceKey
5353
}
5454

55-
release, _, err := readOrFetchRelease(cmd.Release)
55+
release, err := obtainRelease(cmd.Release)
5656
if err != nil {
5757
return err
5858
}

‎cmd/chisel/cmd_find.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (cmd *cmdFind) Execute(args []string) error {
4242
return ErrExtraArgs
4343
}
4444

45-
release, releaseLabel, err := readOrFetchRelease(cmd.Release)
45+
release, err := obtainRelease(cmd.Release)
4646
if err != nil {
4747
return err
4848
}
@@ -57,9 +57,9 @@ func (cmd *cmdFind) Execute(args []string) error {
5757
}
5858

5959
w := tabWriter()
60-
fmt.Fprintf(w, "Slice\tPackage\tRelease\n")
60+
fmt.Fprintf(w, "Slice\tNotes\n")
6161
for _, s := range slices {
62-
fmt.Fprintf(w, "%s\t%s\t%s\n", s, s.Package, releaseLabel)
62+
fmt.Fprintf(w, "%s\t%s\n", s, "-")
6363
}
6464
w.Flush()
6565

‎cmd/chisel/helpers.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,14 @@ func readReleaseInfo() (label, version string, err error) {
4141
return "", "", fmt.Errorf("cannot infer release via /etc/lsb-release, see the --release option")
4242
}
4343

44-
// readOrFetchRelease takes a release branch name or a release directory path.
45-
// It fetches or reads the chisel-release depending on the nature of input and
46-
// returns the release and release label.
47-
// If the input is empty, it tries to read the release label from the host
48-
// system and fetch the chisel-release accordingly.
49-
func readOrFetchRelease(releaseStr string) (release *setup.Release, releaseLabel string, err error) {
44+
// obtainRelease returns the Chisel release information matching the provided string,
45+
// fetching it if necessary. The provided string should be either:
46+
// * "<name>-<version>",
47+
// * the path to a directory containing a previously fetched release,
48+
// * "" and Chisel will attempt to read the release label from the host.
49+
func obtainRelease(releaseStr string) (release *setup.Release, err error) {
5050
if strings.Contains(releaseStr, "/") {
5151
release, err = setup.ReadRelease(releaseStr)
52-
releaseLabel = releaseStr
5352
} else {
5453
var label, version string
5554
if releaseStr == "" {
@@ -58,16 +57,15 @@ func readOrFetchRelease(releaseStr string) (release *setup.Release, releaseLabel
5857
label, version, err = parseReleaseInfo(releaseStr)
5958
}
6059
if err != nil {
61-
return nil, "", err
60+
return nil, err
6261
}
6362
release, err = setup.FetchRelease(&setup.FetchOptions{
6463
Label: label,
6564
Version: version,
6665
})
67-
releaseLabel = label + "-" + version
6866
}
6967
if err != nil {
70-
return nil, "", err
68+
return nil, err
7169
}
72-
return release, releaseLabel, nil
70+
return release, nil
7371
}

0 commit comments

Comments
 (0)