fixed ip6tables command in error message

bboehmke · bboehmke · commit 7d9282b56733 · 2020-12-11T11:10:55.000+01:00
Signed-off-by: Benjamin Böhmke &lt;benjamin@boehmke.net&gt;
diff --git a/iptables/iptables.go b/iptables/iptables.go
@@ -533,16 +533,18 @@ func (iptable IPTable) raw(args ...string) ([]byte, error) {
 	}
 
 	path := iptablesPath
+	commandName := "iptables"
 	if iptable.Version == IPv6 {
 		path = ip6tablesPath
+		commandName = "ip6tables"
 	}
 
 	logrus.Debugf("%s, %v", path, args)
 
 	startTime := time.Now()
 	output, err := exec.Command(path, args...).CombinedOutput()
 	if err != nil {
-		return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err)
+		return nil, fmt.Errorf("iptables failed: %s %v: %s (%s)", commandName, strings.Join(args, " "), output, err)
 	}
 
 	return filterOutput(startTime, output, args...), err

Original file line number	Diff line number	Diff line change
`@@ -533,16 +533,18 @@ func (iptable IPTable) raw(args ...string) ([]byte, error) {`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`path := iptablesPath`
	`536`	`+ commandName := "iptables"`
`536`	`537`	`if iptable.Version == IPv6 {`
`537`	`538`	`path = ip6tablesPath`
	`539`	`+ commandName = "ip6tables"`
`538`	`540`	`}`
`539`	`541`
`540`	`542`	`logrus.Debugf("%s, %v", path, args)`
`541`	`543`
`542`	`544`	`startTime := time.Now()`
`543`	`545`	`output, err := exec.Command(path, args...).CombinedOutput()`
`544`	`546`	`if err != nil {`
`545`		`- return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err)`
	`547`	`+ return nil, fmt.Errorf("iptables failed: %s %v: %s (%s)", commandName, strings.Join(args, " "), output, err)`
`546`	`548`	`}`
`547`	`549`
`548`	`550`	`return filterOutput(startTime, output, args...), err`