opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add dpkg support for returning oci/conmon versions

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1224
Approved by: baude
This commit is contained in:
Daniel J Walsh
2018-08-07 06:42:02 -06:00
committed by Atomic Bot
parent 33d6221ae3
commit 0f1086cf7c
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libpod/oci_linux.go
View File

@ -113,10 +113,25 @@ func rpmVersion(path string) string {
return strings.Trim(output, "\n")
}
func dpkgVersion(path string) string {
output := "Unknown"
cmd := exec.Command("/usr/bin/dpkg", "-S", path)
if outp, err := cmd.Output(); err == nil {
output = string(outp)
}
return strings.Trim(output, "\n")
}
func (r *OCIRuntime) pathPackage() string {
return rpmVersion(r.path)
if out := rpmVersion(r.path); out != "Unknown" {
return out
}
return dpkgVersion(r.path)
}
func (r *OCIRuntime) conmonPackage() string {
return rpmVersion(r.conmonPath)
if out := rpmVersion(r.conmonPath); out != "Unknown" {
return out
}
return dpkgVersion(r.conmonPath)
}