From b6f5163460b7cd6ca26c49e00da99d3d8d5831e2 Mon Sep 17 00:00:00 2001
From: xatier <xatierlike@gmail.com>
Date: Wed, 16 Dec 2020 04:07:46 -0800
Subject: Add support for pacman package version query

- refactor package query logic to be package manager agnostic.

- `pacman -Qo` is the equivalent to `rpm -qf` [1].

[1] https://wiki.archlinux.org/index.php/Pacman/Rosetta#Querying_specific_packages

Signed-off-by: xatier <xatierlike@gmail.com>
---
 libpod/util.go | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'libpod')

diff --git a/libpod/util.go b/libpod/util.go
index c26039c50..ae9ef7172 100644
--- a/libpod/util.go
+++ b/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 outp, err := cmd.Output(); err == nil {
-		output = string(outp)
+	if 1 < len(cmdArg) {
+		cmd := exec.Command(cmdArg[0], cmdArg[1:]...)
+		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
-	cmd := exec.Command("/usr/bin/rpm", "-q", "-f", path)
-	if outp, err := cmd.Output(); err == nil {
-		output = string(outp)
-	}
-	return strings.Trim(output, "\n")
+	return queryPackageVersion("/usr/bin/rpm", "-q", "-f", path)
 }
 
 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) {
-- 
cgit v1.2.3-54-g00ecf