From c980b99a240110e554b0cc09e96dd52daca5e74c Mon Sep 17 00:00:00 2001 From: Philipp Spitzer Date: Wed, 7 Dec 2016 21:21:09 +0100 Subject: [PATCH] Now errors in blockip related subcommands are ignored. e.g. 'iptables: Bad rule (does a matching rule exist in that chain?).' --- bin/tdyndns_update | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/tdyndns_update b/bin/tdyndns_update index 27bfed0..8806c8a 100755 --- a/bin/tdyndns_update +++ b/bin/tdyndns_update @@ -71,19 +71,21 @@ def nsupdate_delete(fqdn, ip_family): def blockip_whitelist_add(ip): """ :param ip: ipv4 address - :raises a CalledProcessError in case of errors.""" + """ if ipfamily_by_ip(ip) == 'A': command = ['iptables', '-I', 'blockip', '-s', str(ip), '-j', 'ACCEPT'] - check_call(command) + p = Popen(command, stderr=PIPE) + stdout, stderr = p.communicate() def blockip_whitelist_delete(ip): """ :param ip: ipv4 address - :raises a CalledProcessError in case of errors.""" + """ if ipfamily_by_ip(ip) == 'A': command = ['iptables', '-D', 'blockip', '-s', str(ip), '-j', 'ACCEPT'] - check_call(command) + p = Popen(command, stderr=PIPE) + stdout, stderr = p.communicate() def main(args): -- 2.39.5