Browse code

* do not consider iptables' output an error in case of xtables lock Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com> (github: gdm85)

Giuseppe Mazzotta authored on 2014/05/29 22:57:29
Showing 1 changed files
... ...
@@ -166,5 +166,10 @@ func Raw(args ...string) ([]byte, error) {
166 166
 		return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err)
167 167
 	}
168 168
 
169
+	// ignore iptables' message about xtables lock
170
+	if strings.Contains(string(output), "waiting for it to exit") {
171
+		output = []byte("")
172
+	}
173
+
169 174
 	return output, err
170 175
 }