Merge pull request #10092 from afbjorklund/podman-debian

medyagh · web-flow · commit 662f2c3ebf70 · 2021-01-05T15:00:19.000-08:00
Handle podman installations without default bridge
diff --git a/pkg/drivers/kic/oci/network_create.go b/pkg/drivers/kic/oci/network_create.go
@@ -221,8 +221,13 @@ func podmanNetworkInspect(name string) (netInfo, error) {
 		return info, err
 	}
 
+	output := rr.Stdout.String()
+	if output == "" {
+		return info, fmt.Errorf("no bridge network found for %s", name)
+	}
+
 	// results looks like 172.17.0.0/16,172.17.0.1,1500
-	vals := strings.Split(strings.TrimSpace(rr.Stdout.String()), ",")
+	vals := strings.Split(strings.TrimSpace(output), ",")
 	if len(vals) == 0 {
 		return info, fmt.Errorf("empty list network inspect: %q", rr.Output())
 	}

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,13 @@ func podmanNetworkInspect(name string) (netInfo, error) {`
`221`	`221`	`return info, err`
`222`	`222`	`}`
`223`	`223`
	`224`	`+ output := rr.Stdout.String()`
	`225`	`+ if output == "" {`
	`226`	`+ return info, fmt.Errorf("no bridge network found for %s", name)`
	`227`	`+ }`
	`228`	`+`
`224`	`229`	`// results looks like 172.17.0.0/16,172.17.0.1,1500`
`225`		`- vals := strings.Split(strings.TrimSpace(rr.Stdout.String()), ",")`
	`230`	`+ vals := strings.Split(strings.TrimSpace(output), ",")`
`226`	`231`	`if len(vals) == 0 {`
`227`	`232`	`return info, fmt.Errorf("empty list network inspect: %q", rr.Output())`
`228`	`233`	`}`