vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #6105 from gdm85/master

Browse source 
Do not consider iptables' output an error in case of xtables lock
This commit is contained in:
Michael Crosby 2014-05-29 11:06:25 -07:00
commit c22a0a3297
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iptables/iptables.go
View file

@ -166,5 +166,10 @@ func Raw(args ...string) ([]byte, error) {
return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err) return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err)
} }
// ignore iptables' message about xtables lock
if strings.Contains(string(output), "waiting for it to exit") {
output = []byte("")
}
return output, err return output, err
} }