commit f19023554c6b400b6b3b665993ed788b872fa55b Author: teor <teor2345@gmail.com> Date: Thu Sep 14 09:34:48 2017 +1000 Stop crashing when the configured dns_conf is None Fix on commit c889534 in 21903. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index aeab347..d48f383 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -894,7 +894,7 @@ class TorEnviron(chutney.Templating.Environ): dns_conf = TorEnviron.DEFAULT_DNS_RESOLV_CONF else: dns_conf = my['dns_conf'] - dns_conf = os.path.abspath(my['dns_conf']) + dns_conf = os.path.abspath(dns_conf) # work around Tor bug #21900, where exits fail when the DNS conf # file does not exist, or is a broken symlink # (os.path.exists returns False for broken symbolic links)