Merge pull request #8738 from xatier/master

Add support for pacman package version query

libpod/util.go

@@ -142,29 +142,37 @@ func JSONDeepCopy(from, to interface{}) error {
 	return json.Unmarshal(tmp, to)
 }
 
-func dpkgVersion(path string) string {
+func queryPackageVersion(cmdArg ...string) string {
 	output := unknownPackage
-	cmd := exec.Command("/usr/bin/dpkg", "-S", path)
+	if 1 < len(cmdArg) {
-	if outp, err := cmd.Output(); err == nil {
+		cmd := exec.Command(cmdArg[0], cmdArg[1:]...)
-		output = string(outp)
+		if outp, err := cmd.Output(); err == nil {
+			output = string(outp)
+		}
 	}
 	return strings.Trim(output, "\n")
 }
 
+func pacmanVersion(path string) string {
+	return queryPackageVersion("/usr/bin/pacman", "-Qo", path)
+}
+
+func dpkgVersion(path string) string {
+	return queryPackageVersion("/usr/bin/dpkg", "-S", path)
+}
+
 func rpmVersion(path string) string {
-	output := unknownPackage
+	return queryPackageVersion("/usr/bin/rpm", "-q", "-f", path)
-	cmd := exec.Command("/usr/bin/rpm", "-q", "-f", path)
-	if outp, err := cmd.Output(); err == nil {
-		output = string(outp)
-	}
-	return strings.Trim(output, "\n")
 }
 
 func packageVersion(program string) string {
 	if out := rpmVersion(program); out != unknownPackage {
 		return out
 	}
-	return dpkgVersion(program)
+	if out := dpkgVersion(program); out != unknownPackage {
+		return out
+	}
+	return pacmanVersion(program)
 }
 
 func programVersion(mountProgram string) (string, error) {