lint: Clean up E126 PEP-8 rule.

This commit is contained in:
Tim Abbott
2017-01-23 22:06:13 -08:00
parent 31e7dcd86b
commit 4e171ce787
60 changed files with 429 additions and 432 deletions

View File

@@ -110,13 +110,13 @@ for device in macs.values():
# Horrible hack to route return packets on the correct interface
# See http://unix.stackexchange.com/a/4421/933
subprocess.check_call(
['/sbin/ip', 'rule', 'add', 'fwmark', str(device_number), 'table', str(device_number)])
['/sbin/ip', 'rule', 'add', 'fwmark', str(device_number), 'table', str(device_number)])
subprocess.check_call(
['/sbin/ip', 'route', 'add', '0.0.0.0/0', 'table', str(device_number), 'dev',
'ens%i' % device_number, 'via', guess_gateway(device_number)])
['/sbin/ip', 'route', 'add', '0.0.0.0/0', 'table', str(device_number), 'dev',
'ens%i' % device_number, 'via', guess_gateway(device_number)])
subprocess.check_call(
['/sbin/iptables', '-t', 'mangle', '-A', 'OUTPUT', '-m', 'conntrack', '--ctorigdst',
address_of(device_number), '-j', 'MARK', '--set-mark', str(device_number)])
['/sbin/iptables', '-t', 'mangle', '-A', 'OUTPUT', '-m', 'conntrack', '--ctorigdst',
address_of(device_number), '-j', 'MARK', '--set-mark', str(device_number)])
to_configure.remove(address_of(device_number))
@@ -126,8 +126,8 @@ for device in macs.values():
log.info("Configuring %s with IP %s" % (device, ip))
subprocess.check_call(['/sbin/ifconfig', device, ip])
subprocess.check_call(
['/sbin/iptables', '-t', 'mangle', '-A', 'OUTPUT', '-m', 'conntrack', '--ctorigdst',
ip, '-j', 'MARK', '--set-mark', str(device_number)])
['/sbin/iptables', '-t', 'mangle', '-A', 'OUTPUT', '-m', 'conntrack', '--ctorigdst',
ip, '-j', 'MARK', '--set-mark', str(device_number)])
for throwaway in range(2):
# Don't freak out if this doens't work.