Merge pull request #17271 from rifelpet/dpkg-query

Split dpkg-query fields with a tab
kubernetes · Feb 20, 2025 · cfe8e62 · cfe8e62
2 parents 12931dd + 24fb33d
commit cfe8e62
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/upup/pkg/fi/nodeup/nodetasks/package.go b/upup/pkg/fi/nodeup/nodetasks/package.go
@@ -145,7 +145,7 @@ func (e *Package) Find(c *fi.NodeupContext) (*Package, error) {
 }
 
 func (e *Package) findDpkg(c *fi.NodeupContext) (*Package, error) {
-	args := []string{"dpkg-query", "-f", "${db:Status-Abbrev}${Version}\\n", "-W", e.Name}
+	args := []string{"dpkg-query", "-f", "${db:Status-Abbrev}\\t${Version}\\n", "-W", e.Name}
 	human := strings.Join(args, " ")
 
 	klog.V(2).Infof("Listing installed packages: %s", human)
@@ -166,12 +166,12 @@ func (e *Package) findDpkg(c *fi.NodeupContext) (*Package, error) {
 			continue
 		}
 
-		tokens := strings.Split(line, " ")
+		tokens := strings.Split(line, "\t")
 		if len(tokens) != 2 {
 			return nil, fmt.Errorf("error parsing dpkg-query line %q", line)
 		}
-		state := tokens[0]
-		version := tokens[1]
+		state := strings.TrimSpace(tokens[0])
+		version := strings.TrimSpace(tokens[1])
 
 		switch state {
 		case "ii":