containers
/
toolbox
mirror of https://github.com/containers/toolbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg/utils: Rename parameter in ParseRelease 

It was not apparent on first glance that the second parameter
represented a release (resp. tag).

https://github.com/containers/toolbox/pull/835
This commit is contained in:
Ondřej Míchal 2021-07-04 00:15:41 +02:00
parent b0b9b8e960
commit f7617912e5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pkg/utils/utils.go
View File

@ -577,7 +577,7 @@ func ShortID(id string) string {
return id return id
} }
func ParseRelease(distro, str string) (string, error) { func ParseRelease(distro, release string) (string, error) {
if distro == "" { if distro == "" {
distro = distroDefault distro = distroDefault
} }
@ -593,17 +593,13 @@ func ParseRelease(distro, str string) (string, error) {
} }
parseRelease := distroObj.ParseRelease parseRelease := distroObj.ParseRelease
release, err := parseRelease(str) release, err := parseRelease(release)
return release, err return release, err
} }
func parseReleaseFedora(str string) (string, error) { func parseReleaseFedora(release string) (string, error) {
var release string if strings.HasPrefix(release, "F") || strings.HasPrefix(release, "f") {
release = release[1:]
if strings.HasPrefix(str, "F") || strings.HasPrefix(str, "f") {
release = str[1:]
} else {
release = str
} }
releaseN, err := strconv.Atoi(release) releaseN, err := strconv.Atoi(release)
@ -618,12 +614,12 @@ func parseReleaseFedora(str string) (string, error) {
return release, nil return release, nil
} }
func parseReleaseRHEL(str string) (string, error) { func parseReleaseRHEL(release string) (string, error) {
if i := strings.IndexRune(str, '.'); i == -1 { if i := strings.IndexRune(release, '.'); i == -1 {
return "", errors.New("release must have a '.'") return "", errors.New("release must have a '.'")
} }
releaseN, err := strconv.ParseFloat(str, 32) releaseN, err := strconv.ParseFloat(release, 32)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -632,7 +628,7 @@ func parseReleaseRHEL(str string) (string, error) {
return "", errors.New("release must be a positive number") return "", errors.New("release must be a positive number")
} }
return str, nil return release, nil
} }
// PathExists wraps around os.Stat providing a nice interface for checking an existence of a path. // PathExists wraps around os.Stat providing a nice interface for checking an existence of a path.