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

Lint: Extract constant unknownPackage 

Addressing goconst warning: 3 other occurrence(s) of "Unknown" found

Signed-off-by: Šimon Lukašík <slukasik@redhat.com>
This commit is contained in:
Šimon Lukašík 2018-11-10 10:26:57 +01:00
parent 4e75551530
commit 7457815ba9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/oci_linux.go
View File

@ -19,6 +19,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const unknownPackage = "Unknown"
func (r *OCIRuntime) moveConmonToCgroup(ctr *Container, cgroupParent string, cmd *exec.Cmd) error { func (r *OCIRuntime) moveConmonToCgroup(ctr *Container, cgroupParent string, cmd *exec.Cmd) error {
if os.Geteuid() == 0 { if os.Geteuid() == 0 {
if r.cgroupManager == SystemdCgroupsManager { if r.cgroupManager == SystemdCgroupsManager {
@ -112,7 +114,7 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string, restor
} }
func rpmVersion(path string) string { func rpmVersion(path string) string {
output := "Unknown" output := unknownPackage
cmd := exec.Command("/usr/bin/rpm", "-q", "-f", path) cmd := exec.Command("/usr/bin/rpm", "-q", "-f", path)
if outp, err := cmd.Output(); err == nil { if outp, err := cmd.Output(); err == nil {
output = string(outp) output = string(outp)
@ -121,7 +123,7 @@ func rpmVersion(path string) string {
} }
func dpkgVersion(path string) string { func dpkgVersion(path string) string {
output := "Unknown" output := unknownPackage
cmd := exec.Command("/usr/bin/dpkg", "-S", path) cmd := exec.Command("/usr/bin/dpkg", "-S", path)
if outp, err := cmd.Output(); err == nil { if outp, err := cmd.Output(); err == nil {
output = string(outp) output = string(outp)
@ -130,14 +132,14 @@ func dpkgVersion(path string) string {
} }
func (r *OCIRuntime) pathPackage() string { func (r *OCIRuntime) pathPackage() string {
if out := rpmVersion(r.path); out != "Unknown" { if out := rpmVersion(r.path); out != unknownPackage {
return out return out
} }
return dpkgVersion(r.path) return dpkgVersion(r.path)
} }
func (r *OCIRuntime) conmonPackage() string { func (r *OCIRuntime) conmonPackage() string {
if out := rpmVersion(r.conmonPath); out != "Unknown" { if out := rpmVersion(r.conmonPath); out != unknownPackage {
return out return out
} }
return dpkgVersion(r.conmonPath) return dpkgVersion(r.conmonPath)